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

chrome/browser/captive_portal/captive_portal_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 <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/base_switches.h"
@@ skipping 301 matching lines @@
 
   // There shouldn't be any extra jobs.
   EXPECT_LE(num_jobs_started_, num_jobs_to_wait_for_);
 
   // Should never be greater, but if it is, go ahead and exit the message loop
   // to try and avoid hanging.
   if (num_jobs_started_ >= num_jobs_to_wait_for_) {
     last_num_jobs_to_wait_for_ = num_jobs_to_wait_for_;
     num_jobs_to_wait_for_ = 0;
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-                            base::MessageLoop::QuitClosure());
+                            base::MessageLoop::QuitWhenIdleClosure());
   }
 }
 
 // static
 void URLRequestTimeoutOnDemandJob::FailOrAbandonJobsOnIOThread(
     int expected_num_jobs,
     EndJobOperation end_job_operation,
     const net::SSLInfo& ssl_info) {
   ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
   ASSERT_LT(0, expected_num_jobs);
@@ skipping 311 matching lines @@
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   ASSERT_EQ(type, content::NOTIFICATION_LOAD_STOP);
   content::NavigationController* controller =
       content::Source<content::NavigationController>(source).ptr();
   ++num_navigations_;
   ++tab_navigation_map_[controller->GetWebContents()];
   if (waiting_for_navigation_ &&
       num_navigations_to_wait_for_ == num_navigations_) {
     waiting_for_navigation_ = false;
-    base::MessageLoopForUI::current()->Quit();
+    base::MessageLoopForUI::current()->QuitWhenIdle();
   }
 }
 
 // This observer creates a list of loading tabs, and then waits for them all
 // to stop loading and have the kInternetConnectedTitle.
 //
 // This is for the specific purpose of observing tabs time out after logging in
 // to a captive portal, which will then cause them to reload.
 // MultiNavigationObserver is insufficient for this because there may or may not
 // be a LOAD_STOP event between the timeout and the reload.
@@ skipping 69 matching lines @@
   ASSERT_EQ(0u, tabs_navigated_to_final_destination_.count(contents));
 
   if (contents->GetTitle() != base::ASCIIToUTF16(kInternetConnectedTitle))
     return;
   tabs_navigated_to_final_destination_.insert(contents);
 
   if (waiting_for_navigation_ &&
       tabs_needing_navigation_.size() ==
           tabs_navigated_to_final_destination_.size()) {
     waiting_for_navigation_ = false;
-    base::MessageLoopForUI::current()->Quit();
+    base::MessageLoopForUI::current()->QuitWhenIdle();
   }
 }
 
 // An observer for watching the CaptivePortalService.  It tracks the last
 // received result and the total number of received results.
 class CaptivePortalObserver : public content::NotificationObserver {
  public:
   explicit CaptivePortalObserver(Profile* profile);
 
   // Runs the message loop until exactly |update_count| captive portal
@@ skipping 73 matching lines @@
   EXPECT_EQ(captive_portal_result_, results->previous_result);
   EXPECT_EQ(captive_portal_service_->last_detection_result(),
             results->result);
 
   captive_portal_result_ = results->result;
   ++num_results_received_;
 
   if (waiting_for_result_ &&
       num_results_to_wait_for_ == num_results_received_) {
     waiting_for_result_ = false;
-    base::MessageLoop::current()->Quit();
+    base::MessageLoop::current()->QuitWhenIdle();
   }
 }
 
 // This observer waits for the SSLErrorHandler to start an interstitial timer
 // for the given web contents.
 class SSLInterstitialTimerObserver {
  public:
   explicit SSLInterstitialTimerObserver(content::WebContents* web_contents);
   ~SSLInterstitialTimerObserver();
 
@@ skipping 2022 matching lines @@
 
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             GetStateOfTabReloaderAt(browser(), broken_tab_index));
 
   WaitForInterstitialAttach(broken_tab_contents);
   portal_observer.WaitForResults(1);
 
   EXPECT_EQ(SSLBlockingPage::kTypeForTesting,
             GetInterstitialType(broken_tab_contents));
 }