Re-enabling socket tests that were previously flaky.

webrtc/base/testclient.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 16 matching lines @@
 
 TestClient::~TestClient() {
   delete socket_;
   for (unsigned i = 0; i < packets_->size(); i++)
     delete (*packets_)[i];
   delete packets_;
 }
 
 bool TestClient::CheckConnState(AsyncPacketSocket::State state) {
   // Wait for our timeout value until the socket reaches the desired state.
-  uint32_t end = TimeAfter(kTimeoutMs);
-  while (socket_->GetState() != state && TimeUntil(end) > 0)
+  int64_t end = TimeAfter(kTimeoutMs);
+  while (socket_->GetState() != state && TimeUntil(end) > 0) {
     Thread::Current()->ProcessMessages(1);
+  }
   return (socket_->GetState() == state);
 }
 
 int TestClient::Send(const char* buf, size_t size) {
   rtc::PacketOptions options;
   return socket_->Send(buf, size, options);
 }
 
 int TestClient::SendTo(const char* buf, size_t size,
                        const SocketAddress& dest) {
   rtc::PacketOptions options;
   return socket_->SendTo(buf, size, dest, options);
 }
 
 TestClient::Packet* TestClient::NextPacket(int timeout_ms) {
   // If no packets are currently available, we go into a get/dispatch loop for
   // at most timeout_ms.  If, during the loop, a packet arrives, then we can
   // stop early and return it.
 
   // Note that the case where no packet arrives is important.  We often want to
   // test that a packet does not arrive.
 
   // Note also that we only try to pump our current thread's message queue.
   // Pumping another thread's queue could lead to messages being dispatched from
   // the wrong thread to non-thread-safe objects.
 
-  uint32_t end = TimeAfter(timeout_ms);
+  int64_t end = TimeAfter(timeout_ms);
   while (TimeUntil(end) > 0) {
     {
       CritScope cs(&crit_);
       if (packets_->size() != 0) {
         break;
       }
     }
     Thread::Current()->ProcessMessages(1);
   }
 
@@ skipping 62 matching lines @@
     : addr(p.addr), buf(0), size(p.size) {
   buf = new char[size];
   memcpy(buf, p.buf, size);
 }
 
 TestClient::Packet::~Packet() {
   delete[] buf;
 }
 
 }  // namespace rtc