Don't use base::MessageLoop::{Quit,QuitClosure} in chrome/

chrome/browser/service_process/service_process_control_browsertest.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 "chrome/browser/service_process/service_process_control.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 37 matching lines @@
                    this),
         base::Bind(
             &ServiceProcessControlBrowserTest::ProcessControlLaunchFailed,
             this));
 
     // Then run the message loop to keep things running.
     content::RunMessageLoop();
   }
 
   static void QuitMessageLoop() {
-    base::MessageLoop::current()->Quit();
+    base::MessageLoop::current()->QuitWhenIdle();
   }
 
   static void CloudPrintInfoCallback(
       const cloud_print::CloudPrintProxyInfo& proxy_info) {
     QuitMessageLoop();
   }
 
   void Disconnect() {
     // This will close the IPC connection.
     ServiceProcessControl::GetInstance()->Disconnect();
@@ skipping 35 matching lines @@
         base::Process::OpenWithAccess(service_pid,
                                       SYNCHRONIZE | PROCESS_QUERY_INFORMATION);
 #else
     service_process_ = base::Process::Open(service_pid);
 #endif
     EXPECT_TRUE(service_process_.IsValid());
     // Quit the current message. Post a QuitTask instead of just calling Quit()
     // because this can get invoked in the context of a Launch() call and we
     // may not be in Run() yet.
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::MessageLoop::QuitClosure());
+        FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
   }
 
   void ProcessControlLaunchFailed() {
     ADD_FAILURE();
     // Quit the current message.
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::MessageLoop::QuitClosure());
+        FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
   }
 
  private:
   base::Process service_process_;
 };
 
 class RealServiceProcessControlBrowserTest
       : public ServiceProcessControlBrowserTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
@@ skipping 61 matching lines @@
   ASSERT_TRUE(ServiceProcessControl::GetInstance()->IsConnected());
   EXPECT_TRUE(ServiceProcessControl::GetInstance()->GetCloudPrintProxyInfo(
         base::Bind(&ServiceProcessControlBrowserTest::CloudPrintInfoCallback)));
   content::RunMessageLoop();
 }
 
 static void DecrementUntilZero(int* count) {
   (*count)--;
   if (!(*count))
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::MessageLoop::QuitClosure());
+        FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
 }
 
 // Flaky on Mac. http://crbug.com/517420
 #if defined(OS_MACOSX)
 #define MAYBE_MultipleLaunchTasks DISABLED_MultipleLaunchTasks
 #else
 #define MAYBE_MultipleLaunchTasks MultipleLaunchTasks
 #endif
 // Invoke multiple Launch calls in succession and ensure that all the tasks
 // get invoked.
 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest,
                        MAYBE_MultipleLaunchTasks) {
   ServiceProcessControl* process = ServiceProcessControl::GetInstance();
   int launch_count = 5;
   for (int i = 0; i < launch_count; i++) {
     // Launch the process asynchronously.
     process->Launch(base::Bind(&DecrementUntilZero, &launch_count),
-                    base::MessageLoop::QuitClosure());
+                    base::MessageLoop::QuitWhenIdleClosure());
   }
   // Then run the message loop to keep things running.
   content::RunMessageLoop();
   EXPECT_EQ(0, launch_count);
 }
 
 // Flaky on Mac. http://crbug.com/517420
 #if defined(OS_MACOSX)
 #define MAYBE_SameLaunchTask DISABLED_SameLaunchTask
 #else
@@ skipping 102 matching lines @@
   // Callback should not be called during GetHistograms call.
   EXPECT_CALL(*this, MockHistogramsCallback()).Times(0);
   // Wait for real callback by providing large timeout value.
   EXPECT_TRUE(ServiceProcessControl::GetInstance()->GetHistograms(
       base::Bind(&ServiceProcessControlBrowserTest::HistogramsCallback,
                 base::Unretained(this)),
       base::TimeDelta::FromHours(1)));
   EXPECT_CALL(*this, MockHistogramsCallback()).Times(1);
   content::RunMessageLoop();
 }