Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(768)

Unified Diff: net/socket/client_socket_pool_base_unittest.cc

Issue 9384024: Prefer ScopedNestableTaskAllower over manual save/restore (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename back to "allow". Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/file_stream_unittest.cc ('k') | net/socket/transport_client_socket_pool_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « net/base/file_stream_unittest.cc ('k') | net/socket/transport_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698