| Index: chrome/browser/service_process/service_process_control_browsertest.cc
|
| diff --git a/chrome/browser/service_process/service_process_control_browsertest.cc b/chrome/browser/service_process/service_process_control_browsertest.cc
|
| index 2be64a7ef89b890f84659edafbc09845dec5dda3..82281949fb4630a18cc0d168de2cd3d2e3485672 100644
|
| --- a/chrome/browser/service_process/service_process_control_browsertest.cc
|
| +++ b/chrome/browser/service_process/service_process_control_browsertest.cc
|
| @@ -55,7 +55,7 @@ class ServiceProcessControlBrowserTest
|
| }
|
|
|
| static void QuitMessageLoop() {
|
| - base::MessageLoop::current()->Quit();
|
| + base::MessageLoop::current()->QuitWhenIdle();
|
| }
|
|
|
| static void CloudPrintInfoCallback(
|
| @@ -111,14 +111,14 @@ class ServiceProcessControlBrowserTest
|
| // 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:
|
| @@ -200,7 +200,7 @@ 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
|
| @@ -218,7 +218,7 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest,
|
| 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();
|
|
|