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 /content/browser/plugin_service_impl_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 'content/browser/plugin_service_impl_browsertest.cc')
| -rw-r--r-- | content/browser/plugin_service_impl_browsertest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/plugin_service_impl_browsertest.cc b/content/browser/plugin_service_impl_browsertest.cc index f34ca1b..74afbb9 100644 --- a/content/browser/plugin_service_impl_browsertest.cc +++ b/content/browser/plugin_service_impl_browsertest.cc @@ -139,7 +139,7 @@ IN_PROC_BROWSER_TEST_F(PluginServiceTest, OpenChannelToPlugin) { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind(&OpenChannel, &mock_client)); - ui_test_utils::RunMessageLoop(); + content::RunMessageLoop(); } // A strict mock that fails if any of the methods are called. They shouldn't be @@ -202,7 +202,7 @@ IN_PROC_BROWSER_TEST_F(PluginServiceTest, CancelOpenChannelToPluginService) { browser()->profile()->GetResourceContext()); BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(OpenChannelAndThenCancel, &mock_client)); - ui_test_utils::RunMessageLoop(); + content::RunMessageLoop(); EXPECT_TRUE(mock_client.get_resource_context_called()); } @@ -273,7 +273,7 @@ IN_PROC_BROWSER_TEST_F( BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind(&OpenChannel, &mock_client)); - ui_test_utils::RunMessageLoop(); + content::RunMessageLoop(); EXPECT_TRUE(mock_client.get_resource_context_called()); EXPECT_TRUE(mock_client.set_plugin_info_called()); EXPECT_TRUE(mock_client.on_found_plugin_process_host_called()); @@ -325,7 +325,7 @@ IN_PROC_BROWSER_TEST_F( BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind(&OpenChannel, &mock_client)); - ui_test_utils::RunMessageLoop(); + content::RunMessageLoop(); EXPECT_TRUE(mock_client.get_resource_context_called()); EXPECT_TRUE(mock_client.set_plugin_info_called()); EXPECT_TRUE(mock_client.on_found_plugin_process_host_called()); |