This is a second attempt at submitting this changelist. The original one was...

net/socket/socket_test_util.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/socket_test_util.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 316 matching lines @@
 // static
 const int ClientSocketPoolTest::kRequestNotFound = -2;
 
 void ClientSocketPoolTest::SetUp() {
   completion_count_ = 0;
 }
 
 void ClientSocketPoolTest::TearDown() {
   // The tests often call Reset() on handles at the end which may post
   // DoReleaseSocket() tasks.
+  // Pending tasks created by client_socket_pool_base_unittest.cc are
+  // posted two milliseconds into the future and thus won't become
+  // scheduled until that time.
+  // We wait a few milliseconds to make sure that all such future tasks
+  // are ready to run, before calling RunAllPending(). This will work
+  // correctly even if Sleep() finishes late (and it should never finish
+  // early), as all we have to ensure is that actual wall-time has progressed
+  // past the scheduled starting time of the pending task.
+  PlatformThread::Sleep(10);
   MessageLoop::current()->RunAllPending();
 }
 
 int ClientSocketPoolTest::GetOrderOfRequest(size_t index) {
   index--;
   if (index >= requests_.size())
     return kIndexOutOfBounds;
 
   for (size_t i = 0; i < request_order_.size(); i++)
     if (requests_[index] == request_order_[i])
@@ skipping 17 matching lines @@
 }
 
 void ClientSocketPoolTest::ReleaseAllConnections(KeepAlive keep_alive) {
   bool released_one;
   do {
     released_one = ReleaseOneConnection(keep_alive);
   } while (released_one);
 }
 
 }  // namespace net