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/download/download_browsertest.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/download/download_browsertest.cc')
-rw-r--r-- | chrome/browser/download/download_browsertest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 700ed45..1343d31 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -122,7 +122,7 @@ class DownloadsHistoryDataCollector { // Cannot complete immediately because the history backend runs on a // separate thread, so we can assume that the RunMessageLoop below will // be exited by the Quit in OnQueryDownloadsComplete. - ui_test_utils::RunMessageLoop(); + content::RunMessageLoop(); } bool GetDownloadsHistoryEntry(DownloadPersistentStoreInfo* result) { @@ -1034,7 +1034,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadResourceThrottleCancels) { &download_assempted)); ASSERT_TRUE(download_assempted); observer.WaitForObservation( - base::Bind(&ui_test_utils::RunMessageLoop), + base::Bind(&content::RunMessageLoop), base::Bind(&MessageLoop::Quit, base::Unretained(MessageLoopForUI::current()))); |