chrome: Use base::MessageLoop. (Part 3)

This CL updates chrome/browser/* other than chrome/browser/ui which is in
another CL.

BUG=236029
TBR=brettw

Review URL: https://chromiumcodereview.appspot.com/14113053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202664 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 46 insertions, 46 deletions

diff --git a/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc
index be0879b..a54b9bd 100644
--- a/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc
@@ -94,7 +94,7 @@ class BrowsingDataCookieHelperTest : public testing::Test {
     EXPECT_EQ("B", it->Name());
 
     ASSERT_TRUE(++it == cookies.end());
-    MessageLoop::current()->Quit();
+    base::MessageLoop::current()->Quit();
   }
 
   void DomainCookieCallback(const net::CookieList& cookies) {
@@ -114,7 +114,7 @@ class BrowsingDataCookieHelperTest : public testing::Test {
     EXPECT_EQ("2", it->Value());
 
     ASSERT_TRUE(++it == cookies.end());
-    MessageLoop::current()->Quit();
+    base::MessageLoop::current()->Quit();
   }
 
   void DeleteCallback(const net::CookieList& cookies) {
@@ -126,7 +126,7 @@ class BrowsingDataCookieHelperTest : public testing::Test {
     EXPECT_EQ("B", it->Name());
 
     ASSERT_TRUE(++it == cookies.end());
-    MessageLoop::current()->Quit();
+    base::MessageLoop::current()->Quit();
   }
 
   void CannedUniqueCallback(const net::CookieList& cookies) {
@@ -209,7 +209,7 @@ class BrowsingDataCookieHelperTest : public testing::Test {
   }
 
  protected:
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
   scoped_ptr<content::TestBrowserThread> ui_thread_;
   scoped_ptr<content::TestBrowserThread> io_thread_;
   scoped_ptr<TestingProfile> testing_profile_;
@@ -227,7 +227,7 @@ TEST_F(BrowsingDataCookieHelperTest, FetchData) {
                  base::Unretained(this)));
 
   // Blocks until BrowsingDataCookieHelperTest::FetchCallback is notified.
-  MessageLoop::current()->Run();
+  base::MessageLoop::current()->Run();
 }
 
 TEST_F(BrowsingDataCookieHelperTest, DomainCookie) {
@@ -240,7 +240,7 @@ TEST_F(BrowsingDataCookieHelperTest, DomainCookie) {
                  base::Unretained(this)));
 
   // Blocks until BrowsingDataCookieHelperTest::FetchCallback is notified.
-  MessageLoop::current()->Run();
+  base::MessageLoop::current()->Run();
 }
 
 TEST_F(BrowsingDataCookieHelperTest, DeleteCookie) {
@@ -253,7 +253,7 @@ TEST_F(BrowsingDataCookieHelperTest, DeleteCookie) {
                  base::Unretained(this)));
 
   // Blocks until BrowsingDataCookieHelperTest::FetchCallback is notified.
-  MessageLoop::current()->Run();
+  base::MessageLoop::current()->Run();
 
   net::CanonicalCookie cookie = cookie_list_[0];
   cookie_helper->DeleteCookie(cookie);
@@ -261,7 +261,7 @@ TEST_F(BrowsingDataCookieHelperTest, DeleteCookie) {
   cookie_helper->StartFetching(
       base::Bind(&BrowsingDataCookieHelperTest::DeleteCallback,
                  base::Unretained(this)));
-  MessageLoop::current()->Run();
+  base::MessageLoop::current()->Run();
 }
 
 TEST_F(BrowsingDataCookieHelperTest, CannedDomainCookie) {
diff --git a/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
index 019a45b..ab1d7c3 100644
--- a/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
@@ -73,7 +73,7 @@ class StopTestOnCallback {
     ASSERT_EQ(1UL, database_info_list.size());
     EXPECT_EQ(std::string(kTestIdentifier1),
               database_info_list.begin()->origin_identifier);
-    MessageLoop::current()->Quit();
+    base::MessageLoop::current()->Quit();
   }
 
  private:
diff --git a/chrome/browser/browsing_data/browsing_data_database_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_database_helper_unittest.cc
index 5d30ec0..2f96b36 100644
--- a/chrome/browser/browsing_data/browsing_data_database_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_database_helper_unittest.cc
@@ -20,7 +20,7 @@ class CannedBrowsingDataDatabaseHelperTest : public testing::Test {
   }
 
  protected:
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
 };
 
diff --git a/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc
index 922a169..d2f2ef3 100644
--- a/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc
@@ -90,13 +90,13 @@ class BrowsingDataFileSystemHelperTest : public testing::Test {
 
   // Blocks on the current MessageLoop until Notify() is called.
   void BlockUntilNotified() {
-    MessageLoop::current()->Run();
+    base::MessageLoop::current()->Run();
   }
 
   // Unblocks the current MessageLoop. Should be called in response to some sort
   // of async activity in a callback method.
   void Notify() {
-    MessageLoop::current()->Quit();
+    base::MessageLoop::current()->Quit();
   }
 
   // Callback that should be executed in response to
@@ -197,7 +197,7 @@ class BrowsingDataFileSystemHelperTest : public testing::Test {
   // message_loop_, as well as all the threads associated with it must be
   // defined before profile_ to prevent explosions. The threads also must be
   // defined in the order they're listed here. Oh how I love C++.
-  MessageLoopForUI message_loop_;
+  base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread db_thread_;
   content::TestBrowserThread webkit_thread_;
diff --git a/chrome/browser/browsing_data/browsing_data_helper_browsertest.h b/chrome/browser/browsing_data/browsing_data_helper_browsertest.h
index 1f953e3..f60e36a 100644
--- a/chrome/browser/browsing_data/browsing_data_helper_browsertest.h
+++ b/chrome/browser/browsing_data/browsing_data_helper_browsertest.h
@@ -24,7 +24,7 @@ class BrowsingDataHelperCallback {
   }
 
   const std::list<T>& result() {
-    MessageLoop::current()->Run();
+    base::MessageLoop::current()->Run();
     DCHECK(has_result_);
     return result_;
   }
@@ -32,7 +32,7 @@ class BrowsingDataHelperCallback {
   void callback(const std::list<T>& info) {
     result_ = info;
     has_result_ = true;
-    MessageLoop::current()->Quit();
+    base::MessageLoop::current()->Quit();
   }
 
  private:
diff --git a/chrome/browser/browsing_data/browsing_data_local_storage_helper.cc b/chrome/browser/browsing_data/browsing_data_local_storage_helper.cc
index 40e2036..906ba0a 100644
--- a/chrome/browser/browsing_data/browsing_data_local_storage_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper.cc
@@ -128,10 +128,10 @@ void CannedBrowsingDataLocalStorageHelper::StartFetching(
   completion_callback_ = callback;
 
   // We post a task to emulate async fetching behavior.
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE,
-      base::Bind(&CannedBrowsingDataLocalStorageHelper::
-          ConvertPendingInfo, this));
+      base::Bind(&CannedBrowsingDataLocalStorageHelper::ConvertPendingInfo,
+                 this));
 }
 
 CannedBrowsingDataLocalStorageHelper::~CannedBrowsingDataLocalStorageHelper() {}
@@ -144,7 +144,7 @@ void CannedBrowsingDataLocalStorageHelper::ConvertPendingInfo() {
     local_storage_info_.push_back(
         LocalStorageInfo(*iter, 0,  base::Time()));
   }
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&CannedBrowsingDataLocalStorageHelper::CallCompletionCallback,
                  this));
diff --git a/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
index b123b89..269c647 100644
--- a/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
@@ -102,7 +102,7 @@ class StopTestOnCallback {
     for (size_t i = 0; i < arraysize(kTestHosts); ++i) {
       ASSERT_TRUE(test_hosts_found[i]) << kTestHosts[i];
     }
-    MessageLoop::current()->Quit();
+    base::MessageLoop::current()->Quit();
   }
 
  private:
diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
index cafd2b6..017570c 100644
--- a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
@@ -49,7 +49,7 @@ class BrowsingDataQuotaHelperTest : public testing::Test {
     helper_ = NULL;
     quota_manager_ = NULL;
     quota_info_.clear();
-    MessageLoop::current()->RunUntilIdle();
+    base::MessageLoop::current()->RunUntilIdle();
   }
 
  protected:
@@ -113,7 +113,7 @@ class BrowsingDataQuotaHelperTest : public testing::Test {
     fetching_completed_ = true;
   }
 
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread db_thread_;
   content::TestBrowserThread io_thread_;
@@ -132,7 +132,7 @@ class BrowsingDataQuotaHelperTest : public testing::Test {
 
 TEST_F(BrowsingDataQuotaHelperTest, Empty) {
   StartFetching();
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_TRUE(fetching_completed());
   EXPECT_TRUE(quota_info().empty());
 }
@@ -148,7 +148,7 @@ TEST_F(BrowsingDataQuotaHelperTest, FetchData) {
 
   RegisterClient(kOrigins, arraysize(kOrigins));
   StartFetching();
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_TRUE(fetching_completed());
 
   std::set<QuotaInfo> expected, actual;
@@ -177,7 +177,7 @@ TEST_F(BrowsingDataQuotaHelperTest, IgnoreExtensionsAndDevTools) {
 
   RegisterClient(kOrigins, arraysize(kOrigins));
   StartFetching();
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_TRUE(fetching_completed());
 
   std::set<QuotaInfo> expected, actual;
@@ -193,16 +193,16 @@ TEST_F(BrowsingDataQuotaHelperTest, RevokeHostQuota) {
 
   SetPersistentHostQuota(kHost1, 1);
   SetPersistentHostQuota(kHost2, 10);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
 
   RevokeHostQuota(kHost1);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
 
   GetPersistentHostQuota(kHost1);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(0, quota());
 
   GetPersistentHostQuota(kHost2);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(10, quota());
 }
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc
index fd49924..1c5935b 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -653,7 +653,7 @@ void BrowsingDataRemover::NotifyAndDeleteIfDone() {
 
   // History requests aren't happy if you delete yourself from the callback.
   // As such, we do a delete later.
-  MessageLoop::current()->DeleteSoon(FROM_HERE, this);
+  base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 void BrowsingDataRemover::OnClearedHostnameResolutionCache() {
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index 257e649..b976555 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -133,7 +133,7 @@ class AwaitCompletionHelper : public BrowsingDataRemover::Observer {
     if (!already_quit_) {
       DCHECK(!start_);
       start_ = true;
-      MessageLoop::current()->Run();
+      base::MessageLoop::current()->Run();
     } else {
       DCHECK(!start_);
       already_quit_ = false;
@@ -143,7 +143,7 @@ class AwaitCompletionHelper : public BrowsingDataRemover::Observer {
   void Notify() {
     if (start_) {
       DCHECK(!already_quit_);
-      MessageLoop::current()->Quit();
+      base::MessageLoop::current()->Quit();
       start_ = false;
     } else {
       DCHECK(!already_quit_);
@@ -240,7 +240,7 @@ class RemoveSafeBrowsingCookieTester : public RemoveCookieTester {
         SafeBrowsingService::CreateSafeBrowsingService();
     browser_process_->SetSafeBrowsingService(sb_service);
     sb_service->Initialize();
-    MessageLoop::current()->RunUntilIdle();
+    base::MessageLoop::current()->RunUntilIdle();
 
     // Create a cookiemonster that does not have persistant storage, and replace
     // the SafeBrowsingService created one with it.
@@ -252,7 +252,7 @@ class RemoveSafeBrowsingCookieTester : public RemoveCookieTester {
 
   virtual ~RemoveSafeBrowsingCookieTester() {
     browser_process_->safe_browsing_service()->ShutDown();
-    MessageLoop::current()->RunUntilIdle();
+    base::MessageLoop::current()->RunUntilIdle();
     browser_process_->SetSafeBrowsingService(NULL);
   }
 
@@ -443,7 +443,7 @@ class RemoveAutofillTester : public autofill::PersonalDataManagerObserver {
     profiles.push_back(profile);
 
     personal_data_manager_->SetProfiles(&profiles);
-    MessageLoop::current()->Run();
+    base::MessageLoop::current()->Run();
 
     std::vector<autofill::CreditCard> cards;
     autofill::CreditCard card;
@@ -458,12 +458,12 @@ class RemoveAutofillTester : public autofill::PersonalDataManagerObserver {
     cards.push_back(card);
 
     personal_data_manager_->SetCreditCards(&cards);
-    MessageLoop::current()->Run();
+    base::MessageLoop::current()->Run();
   }
 
  private:
   virtual void OnPersonalDataChanged() OVERRIDE {
-    MessageLoop::current()->Quit();
+    base::MessageLoop::current()->Quit();
   }
 
   autofill::PersonalDataManager* personal_data_manager_;
@@ -655,7 +655,7 @@ class BrowsingDataRemoverTest : public testing::Test,
 
   // message_loop_, as well as all the threads associated with it must be
   // defined before profile_ to prevent explosions. Oh how I love C++.
-  MessageLoopForUI message_loop_;
+  base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread db_thread_;
   content::TestBrowserThread webkit_thread_;
diff --git a/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.cc b/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.cc
index e18f5ec..77068b3 100644
--- a/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.cc
@@ -198,7 +198,7 @@ void CannedBrowsingDataServerBoundCertHelper::StartFetching(
     return;
   // We post a task to emulate async fetching behavior.
   completion_callback_ = callback;
-  MessageLoop::current()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&CannedBrowsingDataServerBoundCertHelper::FinishFetching,
                  this));
diff --git a/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper_unittest.cc
index 1443f54..58f397a 100644
--- a/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper_unittest.cc
@@ -57,7 +57,7 @@ class BrowsingDataServerBoundCertHelperTest
       const net::ServerBoundCertStore::ServerBoundCertList& certs) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     server_bound_cert_list_ = certs;
-    MessageLoop::current()->Quit();
+    base::MessageLoop::current()->Quit();
   }
 
   // net::SSLConfigService::Observer implementation:
@@ -66,7 +66,7 @@ class BrowsingDataServerBoundCertHelperTest
   }
 
  protected:
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
   scoped_ptr<content::TestBrowserThread> ui_thread_;
   scoped_ptr<content::TestBrowserThread> io_thread_;
   scoped_ptr<TestingProfile> testing_profile_;
@@ -87,7 +87,7 @@ TEST_F(BrowsingDataServerBoundCertHelperTest, FetchData) {
 
   // Blocks until BrowsingDataServerBoundCertHelperTest::FetchCallback is
   // notified.
-  MessageLoop::current()->Run();
+  base::MessageLoop::current()->Run();
 
   ASSERT_EQ(2UL, server_bound_cert_list_.size());
   net::ServerBoundCertStore::ServerBoundCertList::const_iterator it =
@@ -116,7 +116,7 @@ TEST_F(BrowsingDataServerBoundCertHelperTest, DeleteCert) {
   helper->StartFetching(
       base::Bind(&BrowsingDataServerBoundCertHelperTest::FetchCallback,
                  base::Unretained(this)));
-  MessageLoop::current()->Run();
+  base::MessageLoop::current()->Run();
 
   EXPECT_EQ(1, ssl_config_changed_count_);
   ASSERT_EQ(1UL, server_bound_cert_list_.size());
@@ -133,7 +133,7 @@ TEST_F(BrowsingDataServerBoundCertHelperTest, DeleteCert) {
   helper->StartFetching(
       base::Bind(&BrowsingDataServerBoundCertHelperTest::FetchCallback,
                  base::Unretained(this)));
-  MessageLoop::current()->Run();
+  base::MessageLoop::current()->Run();
   EXPECT_EQ(2, ssl_config_changed_count_);
   ASSERT_EQ(0UL, server_bound_cert_list_.size());
 }
@@ -155,7 +155,7 @@ TEST_F(BrowsingDataServerBoundCertHelperTest, CannedUnique) {
   helper->StartFetching(
       base::Bind(&BrowsingDataServerBoundCertHelperTest::FetchCallback,
                  base::Unretained(this)));
-  MessageLoop::current()->Run();
+  base::MessageLoop::current()->Run();
 
   ASSERT_EQ(1UL, server_bound_cert_list_.size());
   net::ServerBoundCertStore::ServerBoundCert& cert =
diff --git a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
index 936856f..5452af6 100644
--- a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
@@ -341,7 +341,7 @@ class CookiesTreeModelTest : public testing::Test {
   }
 
  protected:
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_user_blocking_;
   content::TestBrowserThread io_thread_;