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

chrome/browser/download/download_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 <sstream>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file.h"
@@ skipping 127 matching lines @@
     waiting_ = true;
     content::RunMessageLoop();
     waiting_ = false;
   }
 
  private:
   void OnDownloadCreated(content::DownloadManager* manager,
                          content::DownloadItem* item) override {
     DCHECK_EQ(manager_, manager);
     if (waiting_)
-      base::MessageLoopForUI::current()->Quit();
+      base::MessageLoopForUI::current()->QuitWhenIdle();
   }
 
   content::DownloadManager* manager_;
   bool waiting_;
 
   DISALLOW_COPY_AND_ASSIGN(CreatedObserver);
 };
 
 class PercentWaiter : public content::DownloadItem::Observer {
  public:
@@ skipping 21 matching lines @@
 
  private:
   void OnDownloadUpdated(content::DownloadItem* item) override {
     DCHECK_EQ(item_, item);
     if (!error_ &&
         ((prev_percent_ > item_->PercentComplete()) ||
          (item_->GetState() == DownloadItem::COMPLETE &&
           (item_->PercentComplete() != 100)))) {
       error_ = true;
       if (waiting_)
-        base::MessageLoopForUI::current()->Quit();
+        base::MessageLoopForUI::current()->QuitWhenIdle();
     }
     if (item_->GetState() == DownloadItem::COMPLETE && waiting_)
-      base::MessageLoopForUI::current()->Quit();
+      base::MessageLoopForUI::current()->QuitWhenIdle();
   }
 
   void OnDownloadDestroyed(content::DownloadItem* item) override {
     DCHECK_EQ(item_, item);
     item_->RemoveObserver(this);
     item_ = NULL;
   }
 
   content::DownloadItem* item_;
   bool waiting_;
@@ skipping 63 matching lines @@
       *results = results_.Pass();
     }
     return result_valid_;
   }
 
  private:
   void OnQueryDownloadsComplete(
       scoped_ptr<std::vector<history::DownloadRow> > entries) {
     result_valid_ = true;
     results_ = entries.Pass();
-    base::MessageLoopForUI::current()->Quit();
+    base::MessageLoopForUI::current()->QuitWhenIdle();
   }
 
   Profile* profile_;
   scoped_ptr<std::vector<history::DownloadRow> > results_;
   bool result_valid_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadsHistoryDataCollector);
 };
 
 // Mock that simulates a permissions dialog where the user denies
 // permission to install.  TODO(skerner): This could be shared with
 // extensions tests.  Find a common place for this class.
 class MockAbortExtensionInstallPrompt : public ExtensionInstallPrompt {
  public:
   MockAbortExtensionInstallPrompt() :
       ExtensionInstallPrompt(NULL) {
   }
 
   // Simulate a user abort on an extension installation.
   void ConfirmInstall(Delegate* delegate,
                       const Extension* extension,
                       const ShowDialogCallback& show_dialog_callback) override {
     delegate->InstallUIAbort(true);
-    base::MessageLoopForUI::current()->Quit();
+    base::MessageLoopForUI::current()->QuitWhenIdle();
   }
 
   void OnInstallSuccess(const Extension* extension, SkBitmap* icon) override {}
   void OnInstallFailure(const extensions::CrxInstallError& error) override {}
 };
 
 // Mock that simulates a permissions dialog where the user allows
 // installation.
 class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt {
  public:
@@ skipping 76 matching lines @@
     callback_ = callback;
   }
 
   void OnDownloadStored(content::DownloadItem* item,
                         const history::DownloadRow& info) override {
     if (!callback_.is_null() && (!callback_.Run(info)))
         return;
 
     seen_stored_ = true;
     if (waiting_)
-      base::MessageLoopForUI::current()->Quit();
+      base::MessageLoopForUI::current()->QuitWhenIdle();
   }
 
   void OnDownloadHistoryDestroyed() override {
     DownloadServiceFactory::GetForBrowserContext(profile_)->
       GetDownloadHistory()->RemoveObserver(this);
   }
 
   void WaitForStored() {
     if (seen_stored_)
       return;
@@ skipping 693 matching lines @@
     DownloadItem* download = downloads[0];
     EXPECT_EQ(DownloadItem::INTERRUPTED, download->GetState());
     EXPECT_EQ(error, download->GetLastReason());
     return download;
   }
 
  private:
   static void EnsureNoPendingDownloadJobsOnIO(bool* result) {
     if (net::URLRequestSlowDownloadJob::NumberOutstandingRequests())
       *result = false;
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE, base::MessageLoop::QuitClosure());
+    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                            base::MessageLoop::QuitWhenIdleClosure());
   }
 
   // Location of the test data.
   base::FilePath test_dir_;
 
   // Location of the downloads directory for these tests
   base::ScopedTempDir downloads_directory_;
 
   scoped_ptr<DownloadTestFileActivityObserver> file_activity_observer_;
 };
@@ skipping 2422 matching lines @@
 IN_PROC_BROWSER_TEST_F(DownloadTestWithShelf, PRE_DownloadTest_History) {
   // Download a file and wait for it to be stored.
   base::FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
   GURL download_url(URLRequestMockHTTPJob::GetMockUrl(file));
   HistoryObserver observer(browser()->profile());
   DownloadAndWait(browser(), download_url);
   observer.WaitForStored();
   HistoryServiceFactory::GetForProfile(browser()->profile(),
                                        ServiceAccessType::IMPLICIT_ACCESS)
       ->FlushForTest(base::Bind(
-          &base::MessageLoop::Quit,
+          &base::MessageLoop::QuitWhenIdle,
           base::Unretained(base::MessageLoop::current()->current())));
   content::RunMessageLoop();
 }
 
 #if defined(OS_CHROMEOS)
 // Times out on ChromeOS: http://crbug.com/217810
 #define MAYBE_DownloadTest_History DISABLED_DownloadTest_History
 #else
 #define MAYBE_DownloadTest_History DownloadTest_History
 #endif
@@ skipping 76 matching lines @@
 
   scoped_ptr<content::DownloadTestObserver> observer(DangerousDownloadWaiter(
       browser(), 1, content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_DENY));
   ui_test_utils::NavigateToURL(browser(), extension_url);
 
   observer->WaitForFinished();
 
   // Download shelf should close.
   EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
 }