diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 04:45:26 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 04:45:26 +0000 |
| commit | 729eb631a8da3bc48cc2637e90d06b1c1da624f5 (patch) | |
| tree | 66b2c62e5db360e974fc236250da96dfd55fdeb5 /chrome/browser/safe_browsing/safe_browsing_test.cc | |
| parent | 7fe1bf9bf077105d52b76210b142fb203e0a195b (diff) | |
| download | chromium_src-729eb631a8da3bc48cc2637e90d06b1c1da624f5.zip chromium_src-729eb631a8da3bc48cc2637e90d06b1c1da624f5.tar.gz chromium_src-729eb631a8da3bc48cc2637e90d06b1c1da624f5.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/safe_browsing/safe_browsing_test.cc')
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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_; } |