From 729eb631a8da3bc48cc2637e90d06b1c1da624f5 Mon Sep 17 00:00:00 2001
From: "jam@chromium.org"
 <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 26 Jul 2012 04:45:26 +0000
Subject: Move ui_test_utils::RunMessageLoop to test_utils so that it can be
 reused by content_browsertests.

BUG=90448
Review URL: https://chromiumcodereview.appspot.com/10822030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148514 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc  | 6 +++---
 chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc | 4 ++--
 chrome/browser/safe_browsing/safe_browsing_test.cc                | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'chrome/browser/safe_browsing')

diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
index 4c9a7a9..1c23b4c 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -140,7 +140,7 @@ class FakeMalwareDetails : public MalwareDetails {
     // sleep(1) in malware_dom_details it triggers :).
     waiting_ = true;
     LOG(INFO) << "Waiting for dom details.";
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     EXPECT_TRUE(got_dom_);
   }
 
@@ -205,7 +205,7 @@ class TestSafeBrowsingBlockingPage : public SafeBrowsingBlockingPage {
 
   void WaitForDelete() {
     wait_for_delete_ = true;
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
  private:
@@ -329,7 +329,7 @@ class SafeBrowsingBlockingPageTest : public InProcessBrowserTest {
 
   void AssertReportSent() {
     // When a report is scheduled in the IO thread we should get notified.
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
 
     FakeSafeBrowsingService* service =
         static_cast<FakeSafeBrowsingService*>(
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index 7ce93f7..d9b3fe0 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -522,7 +522,7 @@ class TestSBClient
         BrowserThread::IO, FROM_HERE,
         base::Bind(&TestSBClient::CheckDownloadUrlOnIOThread,
                    this, url_chain));
-    ui_test_utils::RunMessageLoop();  // Will stop in OnDownloadUrlCheckResult.
+    content::RunMessageLoop();  // Will stop in OnDownloadUrlCheckResult.
   }
 
   void CheckDownloadHash(const std::string& full_hash) {
@@ -530,7 +530,7 @@ class TestSBClient
         BrowserThread::IO, FROM_HERE,
         base::Bind(&TestSBClient::CheckDownloadHashOnIOThread,
                    this, full_hash));
-    ui_test_utils::RunMessageLoop();  // Will stop in OnDownloadHashCheckResult.
+    content::RunMessageLoop();  // Will stop in OnDownloadHashCheckResult.
   }
 
  private:
diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc
index 19350f6..55f3bb8 100644
--- a/chrome/browser/safe_browsing/safe_browsing_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_test.cc
@@ -384,7 +384,7 @@ class SafeBrowsingServiceTestHelper
         base::Bind(&SafeBrowsingServiceTestHelper::ForceUpdateInIOThread,
                    this));
     // Will continue after OnForceUpdateDone().
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
   void ForceUpdateInIOThread() {
     EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ -403,7 +403,7 @@ class SafeBrowsingServiceTestHelper
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
         base::Bind(&SafeBrowsingServiceTestHelper::CheckUrlOnIOThread,
                    this, url));
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
   void CheckUrlOnIOThread(const GURL& url) {
     EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ -453,7 +453,7 @@ class SafeBrowsingServiceTestHelper
                    this),
         wait_time);
     // Will continue after OnWaitForStatusUpdateDone().
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   void WaitTillServerReady(const char* host, int port) {
@@ -533,7 +533,7 @@ class SafeBrowsingServiceTestHelper
     url_fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE);
     url_fetcher_->SetRequestContext(request_context_);
     url_fetcher_->Start();
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     return response_status_;
   }
 
-- 
cgit v1.1