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/service | |
| 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/service')
| -rw-r--r-- | chrome/browser/service/service_process_control_browsertest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/service/service_process_control_browsertest.cc b/chrome/browser/service/service_process_control_browsertest.cc index 2a9acd0..451ccd4 100644 --- a/chrome/browser/service/service_process_control_browsertest.cc +++ b/chrome/browser/service/service_process_control_browsertest.cc @@ -42,7 +42,7 @@ class ServiceProcessControlBrowserTest this)); // Then run the message loop to keep things running. - ui_test_utils::RunMessageLoop(); + content::RunMessageLoop(); } // Send a Cloud Print status request and wait for a reply from the service. @@ -50,7 +50,7 @@ class ServiceProcessControlBrowserTest ServiceProcessControl::GetInstance()->GetCloudPrintProxyInfo( base::Bind(&ServiceProcessControlBrowserTest::CloudPrintInfoCallback, base::Unretained(this))); - ui_test_utils::RunMessageLoop(); + content::RunMessageLoop(); } void CloudPrintInfoCallback( @@ -147,7 +147,7 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, MessageLoop::QuitClosure()); } // Then run the message loop to keep things running. - ui_test_utils::RunMessageLoop(); + content::RunMessageLoop(); EXPECT_EQ(0, launch_count); // And then shutdown the service process. EXPECT_TRUE(process->Shutdown()); @@ -163,7 +163,7 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, SameLaunchTask) { process->Launch(task, task); } // Then run the message loop to keep things running. - ui_test_utils::RunMessageLoop(); + content::RunMessageLoop(); EXPECT_EQ(0, launch_count); // And then shutdown the service process. EXPECT_TRUE(process->Shutdown()); |