Remove MessageLoop::current()->RunUntilIdle() in net.

net/proxy/dhcp_proxy_script_fetcher_win_unittest.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/proxy/dhcp_proxy_script_fetcher_win.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
+#include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "base/timer/elapsed_timer.h"
 #include "net/base/completion_callback.h"
 #include "net/proxy/dhcp_proxy_script_adapter_fetcher_win.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
@@ skipping 63 matching lines @@
     OnCompletion(0);
   }
 
   void OnCancelTimer() {
     fetcher_->Cancel();
     finished_ = true;
   }
 
   void WaitUntilDone() {
     while (!finished_) {
-      base::MessageLoop::current()->RunUntilIdle();
+      base::RunLoop().RunUntilIdle();
     }
-    base::MessageLoop::current()->RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
   }
 
   // Attempts to give worker threads time to finish.  This is currently
   // very simplistic as completion (via completion callback or cancellation)
   // immediately "detaches" any worker threads, so the best we can do is give
   // them a little time.  If we start running into Valgrind leaks, we can
   // do something a bit more clever to track worker threads even when the
   // DhcpProxyScriptFetcherWin state machine has finished.
   void FinishTestAllowCleanup() {
     base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(30));
@@ skipping 22 matching lines @@
   fetcher.fetcher_->GetPacURL().possibly_invalid_spec();
 
   fetcher.FinishTestAllowCleanup();
 }
 
 TEST(DhcpProxyScriptFetcherWin, RealFetchWithCancel) {
   // Does a Fetch() with an immediate cancel.  As before, just
   // exercises the code without stubbing out dependencies.
   RealFetchTester fetcher;
   fetcher.RunTestWithCancel();
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 
   // Attempt to avoid Valgrind leak reports in case worker thread is
   // still running.
   fetcher.FinishTestAllowCleanup();
 }
 
 // For RealFetchWithDeferredCancel, below.
 class DelayingDhcpProxyScriptAdapterFetcher
     : public DhcpProxyScriptAdapterFetcher {
  public:
@@ skipping 230 matching lines @@
 
   void RunTest() {
     int result = fetcher_.Fetch(
         &pac_text_,
         base::Bind(&FetcherClient::OnCompletion, base::Unretained(this)));
     ASSERT_EQ(ERR_IO_PENDING, result);
   }
 
   void RunMessageLoopUntilComplete() {
     while (!finished_) {
-      base::MessageLoop::current()->RunUntilIdle();
+      base::RunLoop().RunUntilIdle();
     }
-    base::MessageLoop::current()->RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
   }
 
   void RunMessageLoopUntilWorkerDone() {
     DCHECK(fetcher_.adapter_query_.get());
     while (!fetcher_.worker_finished_event_.TimedWait(
         base::TimeDelta::FromMilliseconds(10))) {
-      base::MessageLoop::current()->RunUntilIdle();
+      base::RunLoop().RunUntilIdle();
     }
   }
 
   void OnCompletion(int result) {
     finished_ = true;
     result_ = result;
   }
 
   void ResetTestState() {
     finished_ = false;
@@ skipping 229 matching lines @@
   }
 
   // Re-do the first test to make sure the last test that was run did
   // not leave things in a bad state.
   (*test_functions.begin())(&client);
 }
 
 }  // namespace
 
 }  // namespace net