net: Make TestCompletionCallback use RunLoops.

net/base/test_completion_callback.cc

 // Copyright (c) 2012 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/base/test_completion_callback.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
 #include "net/base/io_buffer.h"
 
 namespace net {
 
 namespace internal {
 
 void TestCompletionCallbackBaseInternal::DidSetResult() {
   have_result_ = true;
-  if (waiting_for_result_)
-    base::MessageLoop::current()->Quit();
+  if (run_loop_)
+    run_loop_->Quit();
 }
 
 void TestCompletionCallbackBaseInternal::WaitForResult() {
-  DCHECK(!waiting_for_result_);
-  while (!have_result_) {
-    waiting_for_result_ = true;
-    base::MessageLoop::current()->Run();
-    waiting_for_result_ = false;
+  DCHECK(!run_loop_);
+  if (!have_result_) {
+    run_loop_.reset(new base::RunLoop());
+    run_loop_->Run();
+    run_loop_.reset();
+    DCHECK(have_result_);
+    // A huge number of tests depend on this class running events after the
+    // result is set.
+    // TODO(mmenke):  We really should fix this.

[mmenke, 2015/05/20 17:37:05]

Note that 300+ tests depend on this - mostly SPDY and HttpCache tests, so may be
more effort than it's worth.

[Ryan Hamilton, 2015/05/20 22:43:48]

Oy!

+    base::RunLoop().RunUntilIdle();
   }
   have_result_ = false;  // Auto-reset for next callback.
 }
 
 TestCompletionCallbackBaseInternal::TestCompletionCallbackBaseInternal()
-    : have_result_(false),
-      waiting_for_result_(false) {
+    : have_result_(false) {
 }
 
 TestCompletionCallbackBaseInternal::~TestCompletionCallbackBaseInternal() {
 }
 
 }  // namespace internal
 
 TestClosure::TestClosure()
     : closure_(base::Bind(&TestClosure::DidSetResult, base::Unretained(this))) {
 }
@@ skipping 24 matching lines @@
 ReleaseBufferCompletionCallback::~ReleaseBufferCompletionCallback() {
 }
 
 void ReleaseBufferCompletionCallback::SetResult(int result) {
   if (!buffer_->HasOneRef())
     result = ERR_FAILED;
   TestCompletionCallback::SetResult(result);
 }
 
 }  // namespace net