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

chrome/browser/policy/cloud/device_management_service_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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 107 matching lines @@
 
  protected:
   void ExpectRequest() {
     if (interceptor_)
       interceptor_->PushJobCallback(base::Bind(&ResponseJob));
   }
 
   void PerformRegistration() {
     ExpectRequest();
     EXPECT_CALL(*this, OnJobDone(DM_STATUS_SUCCESS, _, _))
-        .WillOnce(
-            DoAll(Invoke(this,
-                         &DeviceManagementServiceIntegrationTest::RecordToken),
-                  InvokeWithoutArgs(base::MessageLoop::current(),
-                                    &base::MessageLoop::Quit)));
+        .WillOnce(DoAll(
+            Invoke(this, &DeviceManagementServiceIntegrationTest::RecordToken),
+            InvokeWithoutArgs(base::MessageLoop::current(),
+                              &base::MessageLoop::QuitWhenIdle)));
     scoped_ptr<DeviceManagementRequestJob> job(
         service_->CreateJob(DeviceManagementRequestJob::TYPE_REGISTRATION,
                             g_browser_process->system_request_context()));
     job->SetGaiaToken("gaia_auth_token");
     job->SetOAuthToken("oauth_token");
     job->SetClientID("testid");
     job->GetRequest()->mutable_register_request();
     job->Start(base::Bind(&DeviceManagementServiceIntegrationTest::OnJobDone,
                           base::Unretained(this)));
     base::MessageLoop::current()->Run();
@@ skipping 36 matching lines @@
   PerformRegistration();
   EXPECT_FALSE(token_.empty());
 }
 
 IN_PROC_BROWSER_TEST_P(DeviceManagementServiceIntegrationTest,
                        ApiAuthCodeFetch) {
   PerformRegistration();
 
   ExpectRequest();
   EXPECT_CALL(*this, OnJobDone(DM_STATUS_SUCCESS, _, _))
-      .WillOnce(
-          DoAll(Invoke(this,
-                       &DeviceManagementServiceIntegrationTest::RecordAuthCode),
-                InvokeWithoutArgs(base::MessageLoop::current(),
-                                  &base::MessageLoop::Quit)));
+      .WillOnce(DoAll(
+          Invoke(this, &DeviceManagementServiceIntegrationTest::RecordAuthCode),
+          InvokeWithoutArgs(base::MessageLoop::current(),
+                            &base::MessageLoop::QuitWhenIdle)));
   scoped_ptr<DeviceManagementRequestJob> job(service_->CreateJob(
       DeviceManagementRequestJob::TYPE_API_AUTH_CODE_FETCH,
       g_browser_process->system_request_context()));
   job->SetDMToken(token_);
   job->SetClientID("testid");
   em::DeviceServiceApiAccessRequest* request =
       job->GetRequest()->mutable_service_api_access_request();
   request->add_auth_scope("authScope4Test");
   request->set_oauth2_client_id("oauth2ClientId4Test");
   job->Start(base::Bind(&DeviceManagementServiceIntegrationTest::OnJobDone,
                         base::Unretained(this)));
   base::MessageLoop::current()->Run();
   ASSERT_EQ("fake_auth_code", robot_auth_code_);
 }
 
 IN_PROC_BROWSER_TEST_P(DeviceManagementServiceIntegrationTest, PolicyFetch) {
   PerformRegistration();
 
   ExpectRequest();
   EXPECT_CALL(*this, OnJobDone(DM_STATUS_SUCCESS, _, _))
       .WillOnce(InvokeWithoutArgs(base::MessageLoop::current(),
-                                  &base::MessageLoop::Quit));
+                                  &base::MessageLoop::QuitWhenIdle));
   scoped_ptr<DeviceManagementRequestJob> job(
       service_->CreateJob(DeviceManagementRequestJob::TYPE_POLICY_FETCH,
                           g_browser_process->system_request_context()));
   job->SetDMToken(token_);
   job->SetClientID("testid");
   em::DevicePolicyRequest* request =
       job->GetRequest()->mutable_policy_request();
   request->add_request()->set_policy_type(dm_protocol::kChromeUserPolicyType);
   job->Start(base::Bind(&DeviceManagementServiceIntegrationTest::OnJobDone,
                         base::Unretained(this)));
   base::MessageLoop::current()->Run();
 }
 
 IN_PROC_BROWSER_TEST_P(DeviceManagementServiceIntegrationTest, Unregistration) {
   PerformRegistration();
 
   ExpectRequest();
   EXPECT_CALL(*this, OnJobDone(DM_STATUS_SUCCESS, _, _))
       .WillOnce(InvokeWithoutArgs(base::MessageLoop::current(),
-                                  &base::MessageLoop::Quit));
+                                  &base::MessageLoop::QuitWhenIdle));
   scoped_ptr<DeviceManagementRequestJob> job(
       service_->CreateJob(DeviceManagementRequestJob::TYPE_UNREGISTRATION,
                           g_browser_process->system_request_context()));
   job->SetDMToken(token_);
   job->SetClientID("testid");
   job->GetRequest()->mutable_unregister_request();
   job->Start(base::Bind(&DeviceManagementServiceIntegrationTest::OnJobDone,
                         base::Unretained(this)));
   base::MessageLoop::current()->Run();
 }
 
 IN_PROC_BROWSER_TEST_P(DeviceManagementServiceIntegrationTest, AutoEnrollment) {
   ExpectRequest();
   EXPECT_CALL(*this, OnJobDone(DM_STATUS_SUCCESS, _, _))
       .WillOnce(InvokeWithoutArgs(base::MessageLoop::current(),
-                                  &base::MessageLoop::Quit));
+                                  &base::MessageLoop::QuitWhenIdle));
   scoped_ptr<DeviceManagementRequestJob> job(
       service_->CreateJob(DeviceManagementRequestJob::TYPE_AUTO_ENROLLMENT,
                           g_browser_process->system_request_context()));
   job->SetClientID("testid");
   job->GetRequest()->mutable_auto_enrollment_request()->set_remainder(0);
   job->GetRequest()->mutable_auto_enrollment_request()->set_modulus(1);
   job->Start(base::Bind(&DeviceManagementServiceIntegrationTest::OnJobDone,
                         base::Unretained(this)));
   base::MessageLoop::current()->Run();
 }
 
 INSTANTIATE_TEST_CASE_P(
     DeviceManagementServiceIntegrationTestInstance,
     DeviceManagementServiceIntegrationTest,
     testing::Values(&DeviceManagementServiceIntegrationTest::InitCannedResponse,
                     &DeviceManagementServiceIntegrationTest::InitTestServer));
 
 }  // namespace policy