Index: net/socket/client_socket_pool_base_unittest.cc |
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc |
index 3ef34c48249d7e6079e641c98b0089929413f6e9..b1c1a99e1ed7edbd3fb8bfb724b776e6d173aa5f 100644 |
--- a/net/socket/client_socket_pool_base_unittest.cc |
+++ b/net/socket/client_socket_pool_base_unittest.cc |
@@ -1410,8 +1410,10 @@ class RequestSocketCallback : public TestCompletionCallbackBase { |
handle_->socket()->Disconnect(); |
handle_->Reset(); |
{ |
- MessageLoop::ScopedNestableTaskAllower nestable( |
- MessageLoop::current()); |
+ // TODO: Resolve conflicting intentions of stopping recursion with the |
+ // |!within_callback_| test (above) and the call to |RunAllPending()| |
+ // below. http://crbug.com/114130. |
+ MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current()); |
MessageLoop::current()->RunAllPending(); |
} |
within_callback_ = true; |
@@ -1437,7 +1439,7 @@ class RequestSocketCallback : public TestCompletionCallbackBase { |
// operations that happen on timers (e.g. cleanup of idle |
// connections) can execute. |
{ |
- MessageLoop::ScopedNestableTaskAllower nestable( |
+ MessageLoop::ScopedNestableTaskAllower allow( |
MessageLoop::current()); |
base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(10)); |
EXPECT_EQ(OK, next_job_callback.WaitForResult()); |