Update from https://crrev.com/314320

net/socket/websocket_endpoint_lock_manager_unittest.cc

 // Copyright 2014 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/websocket_endpoint_lock_manager.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "net/base/net_errors.h"
@@ skipping 274 matching lines @@
   RunUntilIdle();
   EXPECT_TRUE(waiters[1].called());
 
   UnlockDummyEndpoint(1);
 }
 
 // UnlockEndpoint() should normally have a delay.
 TEST_F(WebSocketEndpointLockManagerTest, UnlockEndpointIsDelayed) {
   using base::TimeTicks;
 
+  // This 1ms delay is too short for very slow environments (usually those
+  // running memory checkers). In those environments, the code takes >1ms to run
+  // and no delay is needed. Rather than increase the delay and slow down the
+  // test everywhere, the test doesn't explicitly verify that a delay has been
+  // applied. Instead it just verifies that the whole thing took >=1ms. 1ms is
+  // easily enough for normal compiles even on Android, so the fact that there
+  // is a delay is still checked on every platform.
   const base::TimeDelta unlock_delay = base::TimeDelta::FromMilliseconds(1);
   instance()->SetUnlockDelayForTesting(unlock_delay);
   FakeWaiter fake_waiter;
   BlockingWaiter blocking_waiter;
   EXPECT_EQ(OK, instance()->LockEndpoint(DummyEndpoint(), &fake_waiter));
   EXPECT_EQ(ERR_IO_PENDING,
             instance()->LockEndpoint(DummyEndpoint(), &blocking_waiter));
 
   TimeTicks before_unlock = TimeTicks::Now();
   instance()->UnlockEndpoint(DummyEndpoint());
-  RunUntilIdle();
-  EXPECT_FALSE(blocking_waiter.called());
   blocking_waiter.WaitForLock();
   TimeTicks after_unlock = TimeTicks::Now();
   EXPECT_GE(after_unlock - before_unlock, unlock_delay);
   instance()->SetUnlockDelayForTesting(base::TimeDelta());
   UnlockDummyEndpoint(1);
 }
 
 }  // namespace
 
 }  // namespace net