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

76 files changed, 154 insertions, 156 deletions

diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc
index 4e0b43d..1455b93 100644
--- a/chrome/browser/autofill/autofill_browsertest.cc
+++ b/chrome/browser/autofill/autofill_browsertest.cc
@@ -82,7 +82,7 @@ class WindowedPersonalDataManagerObserver : public PersonalDataManagerObserver {
   void Wait() {
     if (!personal_data_changed_) {
       has_run_message_loop_ = true;
-      ui_test_utils::RunMessageLoop();
+      content::RunMessageLoop();
     }
   }
 
diff --git a/chrome/browser/automation/automation_tab_helper_browsertest.cc b/chrome/browser/automation/automation_tab_helper_browsertest.cc
index 40bb8c3..79e0188 100644
--- a/chrome/browser/automation/automation_tab_helper_browsertest.cc
+++ b/chrome/browser/automation/automation_tab_helper_browsertest.cc
@@ -121,7 +121,7 @@ IN_PROC_BROWSER_TEST_F(AutomationTabHelperBrowserTest, FormSubmission) {
   ExpectClientRedirectAndBreak(&mock_observer, &mock_notification_observer);
 
   ASSERT_NO_FATAL_FAILURE(RunTestCaseInJavaScript(1, false));
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 IN_PROC_BROWSER_TEST_F(AutomationTabHelperBrowserTest,
@@ -149,7 +149,7 @@ IN_PROC_BROWSER_TEST_F(AutomationTabHelperBrowserTest,
   ExpectClientRedirectAndBreak(&mock_observer, &mock_notification_observer);
 
   ASSERT_NO_FATAL_FAILURE(RunTestCaseInJavaScript(3, false));
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 IN_PROC_BROWSER_TEST_F(AutomationTabHelperBrowserTest,
@@ -163,7 +163,7 @@ IN_PROC_BROWSER_TEST_F(AutomationTabHelperBrowserTest,
   ExpectClientRedirectAndBreak(&mock_observer, &mock_notification_observer);
 
   ASSERT_NO_FATAL_FAILURE(RunTestCaseInJavaScript(4, false));
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 IN_PROC_BROWSER_TEST_F(AutomationTabHelperBrowserTest,
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index 5f2551e..eb6fcb3 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -177,7 +177,7 @@ class BrowserFocusTest : public InProcessBrowserTest {
         FROM_HERE,
         base::Bind(&CheckFocus, browser(), vid, timeout),
         base::TimeDelta::FromMilliseconds(100));
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     return IsViewFocused(vid);
   }
 
@@ -235,7 +235,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_ClickingMovesFocus) {
       FROM_HERE,
       MessageLoop::QuitClosure(),
       base::TimeDelta::FromMilliseconds(kActionDelayMs));
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 #endif  // defined(OS_POSIX)
 
   ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_));
@@ -637,7 +637,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) {
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
                                           MessageLoop::QuitClosure(),
                                           base::TimeDelta::FromSeconds(1));
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 
   chrome::FocusLocationBar(browser());
 
@@ -762,7 +762,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, InterstitialFocus) {
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
                                           MessageLoop::QuitClosure(),
                                           base::TimeDelta::FromSeconds(1));
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 
   // The interstitial should have focus now.
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER));
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc
index e449788..956da4d 100644
--- a/chrome/browser/browser_keyevents_browsertest.cc
+++ b/chrome/browser/browser_keyevents_browsertest.cc
@@ -99,7 +99,7 @@ class TestFinishObserver : public content::NotificationObserver {
   bool WaitForFinish() {
     if (!finished_) {
       waiting_ = true;
-      ui_test_utils::RunMessageLoop();
+      content::RunMessageLoop();
       waiting_ = false;
     }
     return finished_;
diff --git a/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
index 80017b5..d9ecb91 100644
--- a/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
@@ -87,7 +87,7 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataDatabaseHelperTest, DISABLED_FetchData) {
       base::Bind(&StopTestOnCallback::Callback,
                  base::Unretained(&stop_test_on_callback)));
   // Blocks until StopTestOnCallback::Callback is notified.
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 IN_PROC_BROWSER_TEST_F(BrowsingDataDatabaseHelperTest, CannedAddDatabase) {
diff --git a/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
index 8fb9a10..bd5141f 100644
--- a/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
@@ -118,7 +118,7 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, CallbackCompletes) {
       base::Bind(&StopTestOnCallback::Callback,
                  base::Unretained(&stop_test_on_callback)));
   // Blocks until StopTestOnCallback::Callback is notified.
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, DeleteSingleFile) {
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index 43b9f57..50443f4 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -199,7 +199,7 @@ void URLRequestTimeoutOnDemandJob::WaitForJobs(int num_jobs) {
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&URLRequestTimeoutOnDemandJob::WaitForJobsOnIOThread,
                  num_jobs));
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 // static
@@ -519,7 +519,7 @@ void MultiNavigationObserver::WaitForNavigations(
   if (num_navigations_ < num_navigations_to_wait_for) {
     num_navigations_to_wait_for_ = num_navigations_to_wait_for;
     waiting_for_navigation_ = true;
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     EXPECT_FALSE(waiting_for_navigation_);
   }
   EXPECT_EQ(num_navigations_, num_navigations_to_wait_for);
@@ -610,7 +610,7 @@ void FailLoadsAfterLoginObserver::WaitForNavigations() {
   if (tabs_needing_navigation_.size() !=
           tabs_navigated_to_final_destination_.size()) {
     waiting_for_navigation_ = true;
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     EXPECT_FALSE(waiting_for_navigation_);
   }
   EXPECT_EQ(tabs_needing_navigation_.size(),
@@ -705,7 +705,7 @@ void CaptivePortalObserver::WaitForResults(int num_results_to_wait_for) {
   if (num_results_received_ < num_results_to_wait_for) {
     num_results_to_wait_for_ = num_results_to_wait_for;
     waiting_for_result_ = true;
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     EXPECT_FALSE(waiting_for_result_);
   }
   EXPECT_EQ(num_results_received_, num_results_to_wait_for);
diff --git a/chrome/browser/chromeos/gdata/gdata_documents_service_browsertest.cc b/chrome/browser/chromeos/gdata/gdata_documents_service_browsertest.cc
index 098c56b..10799de 100644
--- a/chrome/browser/chromeos/gdata/gdata_documents_service_browsertest.cc
+++ b/chrome/browser/chromeos/gdata/gdata_documents_service_browsertest.cc
@@ -80,7 +80,7 @@ IN_PROC_BROWSER_TEST_F(GDataTest, Download) {
       gdata_test_server_.GetURL("files/chromeos/gdata/testfile.txt"),
       base::Bind(&TestDownloadCallback, &result, &contents),
       gdata::GetDownloadDataCallback());
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 
   EXPECT_EQ(gdata::HTTP_SUCCESS, result);
   FilePath expected_filepath = gdata_test_server_.document_root().Append(
@@ -99,7 +99,7 @@ IN_PROC_BROWSER_TEST_F(GDataTest, NonExistingDownload) {
       gdata_test_server_.GetURL("files/chromeos/gdata/no-such-file.txt"),
       base::Bind(&TestDownloadCallback, &result, &dummy_contents),
       gdata::GetDownloadDataCallback());
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 
   EXPECT_EQ(gdata::HTTP_NOT_FOUND, result);
   // Do not verify the not found message.
@@ -114,7 +114,7 @@ IN_PROC_BROWSER_TEST_F(GDataTest, GetDocuments) {
       std::string(),  // search string
       std::string(),  // directory resource ID
       base::Bind(&TestGetDocumentsCallback, &result, &result_data));
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 
   EXPECT_EQ(gdata::HTTP_SUCCESS, result);
   ASSERT_TRUE(result_data);
@@ -139,7 +139,7 @@ IN_PROC_BROWSER_TEST_F(GDataTest, GetDocumentsFailure) {
       std::string(),  // search string
       std::string(),  // directory resource ID
       base::Bind(&TestGetDocumentsCallback, &result, &result_data));
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 
   EXPECT_EQ(gdata::GDATA_PARSE_ERROR, result);
   EXPECT_FALSE(result_data);
diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
index d9d22c1..8af8561 100644
--- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc
+++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
@@ -61,7 +61,7 @@ class Waiter : public content::NotificationObserver {
         tester(chromeos::ScreenLocker::GetTester());
     while (tester->IsLocked() != locker_state ||
            browser_->window()->IsFullscreen() != fullscreen) {
-      ui_test_utils::RunMessageLoop();
+      content::RunMessageLoop();
     }
     // Make sure all pending tasks are executed.
     ui_test_utils::RunAllPendingInMessageLoop();
diff --git a/chrome/browser/chromeos/login/screen_locker_tester.cc b/chrome/browser/chromeos/login/screen_locker_tester.cc
index 4ec514f..d2749de 100644
--- a/chrome/browser/chromeos/login/screen_locker_tester.cc
+++ b/chrome/browser/chromeos/login/screen_locker_tester.cc
@@ -73,7 +73,7 @@ LoginAttemptObserver::~LoginAttemptObserver() {
 void LoginAttemptObserver::WaitForAttempt() {
   if (!login_attempted_) {
     waiting_ = true;
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     waiting_ = false;
   }
   ASSERT_TRUE(login_attempted_);
diff --git a/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc b/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc
index fd3aad3..cf31246 100644
--- a/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc
+++ b/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc
@@ -44,7 +44,7 @@ void WizardInProcessBrowserTest::CleanUpOnMainThread() {
   // LoginDisplayHost owns controllers and all windows.
   MessageLoopForUI::current()->DeleteSoon(FROM_HERE, host_);
 
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/process_proxy/process_proxy_browsertest.cc b/chrome/browser/chromeos/process_proxy/process_proxy_browsertest.cc
index 131f9de4..2b88aa7 100644
--- a/chrome/browser/chromeos/process_proxy/process_proxy_browsertest.cc
+++ b/chrome/browser/chromeos/process_proxy/process_proxy_browsertest.cc
@@ -215,14 +215,14 @@ class ProcessProxyTest : public InProcessBrowserTest {
 
     // Wait until all data from output watcher is received (QuitTask will be
     // fired on watcher thread).
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
 
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
          base::Bind(&ProcessProxyTest::EndRegistryTest,
                     base::Unretained(this)));
 
     // Wait until we clean up the process proxy.
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   scoped_ptr<TestRunner> test_runner_;
diff --git a/chrome/browser/debugger/devtools_sanity_browsertest.cc b/chrome/browser/debugger/devtools_sanity_browsertest.cc
index 4a565c3..fcb70b1 100644
--- a/chrome/browser/debugger/devtools_sanity_browsertest.cc
+++ b/chrome/browser/debugger/devtools_sanity_browsertest.cc
@@ -56,7 +56,7 @@ class BrowserClosedObserver : public content::NotificationObserver {
   explicit BrowserClosedObserver(Browser* browser) {
     registrar_.Add(this, chrome::NOTIFICATION_BROWSER_CLOSED,
                    content::Source<Browser>(browser));
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   virtual void Observe(int type,
@@ -204,7 +204,7 @@ class DevToolsExtensionTest : public DevToolsSanityTest,
       MessageLoop::current()->PostDelayedTask(
           FROM_HERE, timeout.callback(), base::TimeDelta::FromSeconds(4));
       extensions::UnpackedInstaller::Create(service)->Load(path);
-      ui_test_utils::RunMessageLoop();
+      content::RunMessageLoop();
       timeout.Cancel();
     }
     size_t num_after = service->extensions()->size();
@@ -236,7 +236,7 @@ class DevToolsExtensionTest : public DevToolsSanityTest,
       if (!(*iter)->IsLoading())
         ++iter;
       else
-        ui_test_utils::RunMessageLoop();
+        content::RunMessageLoop();
     }
 
     timeout.Cancel();
@@ -352,7 +352,7 @@ class WorkerDevToolsSanityTest : public InProcessBrowserTest {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&TerminateWorkerOnIOThread, worker_data));
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   static void WaitForFirstSharedWorkerOnIOThread(
@@ -376,7 +376,7 @@ class WorkerDevToolsSanityTest : public InProcessBrowserTest {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&WaitForFirstSharedWorkerOnIOThread, worker_data));
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     return worker_data;
   }
 
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())));
 
diff --git a/chrome/browser/download/download_test_observer.cc b/chrome/browser/download/download_test_observer.cc
index 13d6791..3f11dc2 100644
--- a/chrome/browser/download/download_test_observer.cc
+++ b/chrome/browser/download/download_test_observer.cc
@@ -71,7 +71,7 @@ void DownloadTestObserver::Init() {
 void DownloadTestObserver::WaitForFinished() {
   if (!IsFinished()) {
     waiting_ = true;
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     waiting_ = false;
   }
 }
@@ -269,7 +269,7 @@ DownloadTestFlushObserver::DownloadTestFlushObserver(
 void DownloadTestFlushObserver::WaitForFlush() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   download_manager_->AddObserver(this);
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 void DownloadTestFlushObserver::ModelChanged(DownloadManager* manager) {
@@ -377,7 +377,7 @@ void DownloadTestItemCreationObserver::WaitForDownloadItemCreation() {
 
   if (called_back_count_ == 0) {
     waiting_ = true;
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     waiting_ = false;
   }
 }
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index 85d69f8..92ed9b39 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -134,7 +134,7 @@ class SavePageBrowserTest : public InProcessBrowserTest {
 
     // Run message loop until a quit message is sent from
     // OnQueryDownloadEntriesComplete().
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   void OnQueryDownloadEntriesComplete(
diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc
index 6ea6fd0..0793ba9 100644
--- a/chrome/browser/errorpage_browsertest.cc
+++ b/chrome/browser/errorpage_browsertest.cc
@@ -103,7 +103,7 @@ class ErrorPageTest : public InProcessBrowserTest {
       FAIL();
     }
     test_navigation_observer.WaitForObservation(
-        base::Bind(&ui_test_utils::RunMessageLoop),
+        base::Bind(&content::RunMessageLoop),
         base::Bind(&MessageLoop::Quit,
                    base::Unretained(MessageLoopForUI::current())));
 
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
index f40d67f..0765f85 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
@@ -193,7 +193,7 @@ class DownloadsEventsListener : public content::NotificationObserver {
         return true;
     }
     waiting_ = true;
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     bool success = !waiting_;
     if (waiting_) {
       // Print the events that were caught since the last WaitFor() call to help
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
index f464781..79a45e6 100644
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
@@ -69,7 +69,7 @@ class WebstoreInstallListener : public WebstoreInstaller::Delegate {
       return;
 
     waiting_ = true;
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   bool received_failure() const { return received_failure_; }
diff --git a/chrome/browser/extensions/app_notification_browsertest.cc b/chrome/browser/extensions/app_notification_browsertest.cc
index 321f1c2..73dd7ea 100644
--- a/chrome/browser/extensions/app_notification_browsertest.cc
+++ b/chrome/browser/extensions/app_notification_browsertest.cc
@@ -63,7 +63,7 @@ IN_PROC_BROWSER_TEST_F(AppNotificationTest, SaveClientId) {
           browser()->profile(), app, extension_misc::LAUNCH_TAB,
           NEW_FOREGROUND_TAB));
   if (!interceptor.was_called())
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   EXPECT_TRUE(interceptor.was_called());
 
   ExtensionService* service = browser()->profile()->GetExtensionService();
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index cc73033..61170fc 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -495,7 +495,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenAppFromExtension) {
 
   // Wait for app tab to be created and loaded.
   test_navigation_observer.WaitForObservation(
-      base::Bind(&ui_test_utils::RunMessageLoop),
+      base::Bind(&content::RunMessageLoop),
       base::Bind(&MessageLoop::Quit,
                  base::Unretained(MessageLoopForUI::current())));
 
diff --git a/chrome/browser/extensions/convert_web_app_browsertest.cc b/chrome/browser/extensions/convert_web_app_browsertest.cc
index 7744ce3..8c20e9c 100644
--- a/chrome/browser/extensions/convert_web_app_browsertest.cc
+++ b/chrome/browser/extensions/convert_web_app_browsertest.cc
@@ -65,7 +65,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionFromWebAppTest, Basic) {
           "files/extensions/convert_web_app/application.html"));
 
   if (!installed_extension_)
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
 
   EXPECT_TRUE(installed_extension_);
   EXPECT_TRUE(installed_extension_->is_hosted_app());
diff --git a/chrome/browser/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc
index 3026f23..550c2dc 100644
--- a/chrome/browser/extensions/crx_installer_browsertest.cc
+++ b/chrome/browser/extensions/crx_installer_browsertest.cc
@@ -107,7 +107,7 @@ class ExtensionCrxInstallerTest : public ExtensionBrowserTest {
     installer->set_allow_silent_install(true);
     installer->set_is_gallery_install(true);
     installer->InstallCrx(PackExtension(ext_path));
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
 
     EXPECT_TRUE(mock_install_prompt->did_succeed());
     return installer;
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index 4d89f85..01d40d5 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -51,7 +51,7 @@ bool ExtensionApiTest::ResultCatcher::GetNextResult() {
   // empty.
   if (results_.empty()) {
     waiting_ = true;
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     waiting_ = false;
   }
 
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index b89ae3b..eb319ca 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -85,7 +85,7 @@ const Extension* ExtensionBrowserTest::LoadExtensionWithOptions(
         extensions::UnpackedInstaller::Create(service));
     installer->set_prompt_for_plugins(false);
     installer->Load(path);
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   // Find the loaded extension by its path. See crbug.com/59531 for why
@@ -327,7 +327,7 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
 
     installer->InstallCrx(crx_path);
 
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   size_t num_after = service->extensions()->size();
@@ -423,7 +423,7 @@ bool ExtensionBrowserTest::WaitForExtensionViewsToLoad() {
     if (!(*iter)->IsLoading()) {
       ++iter;
     } else {
-      ui_test_utils::RunMessageLoop();
+      content::RunMessageLoop();
 
       // Test activity may have modified the set of extension processes during
       // message processing, so re-start the iteration to catch added/removed
diff --git a/chrome/browser/extensions/extension_function_test_utils.cc b/chrome/browser/extensions/extension_function_test_utils.cc
index 47aee00..47c727d 100644
--- a/chrome/browser/extensions/extension_function_test_utils.cc
+++ b/chrome/browser/extensions/extension_function_test_utils.cc
@@ -224,7 +224,7 @@ bool RunFunction(UIThreadExtensionFunction* function,
   // message loop until they do.
   if (!response_delegate.HasResponse()) {
     response_delegate.set_should_post_quit(true);
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   EXPECT_TRUE(response_delegate.HasResponse());
diff --git a/chrome/browser/extensions/extension_test_message_listener.cc b/chrome/browser/extensions/extension_test_message_listener.cc
index 1405449..1a98046 100644
--- a/chrome/browser/extensions/extension_test_message_listener.cc
+++ b/chrome/browser/extensions/extension_test_message_listener.cc
@@ -27,7 +27,7 @@ bool ExtensionTestMessageListener::WaitUntilSatisfied()  {
   if (satisfied_)
     return true;
   waiting_ = true;
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
   return satisfied_;
 }
 
diff --git a/chrome/browser/geolocation/access_token_store_browsertest.cc b/chrome/browser/geolocation/access_token_store_browsertest.cc
index 7aab53e..c964546 100644
--- a/chrome/browser/geolocation/access_token_store_browsertest.cc
+++ b/chrome/browser/geolocation/access_token_store_browsertest.cc
@@ -76,7 +76,7 @@ void GeolocationAccessTokenStoreTest::DoTestStepAndWaitForResults(
           base::Bind(
               &GeolocationAccessTokenStoreTest::OnAccessTokenStoresLoaded,
               base::Unretained(this))));
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 void GeolocationAccessTokenStoreTest::OnAccessTokenStoresLoaded(
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index 3e4b583..abc35b0 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -62,7 +62,7 @@ class IFrameLoader : public content::NotificationObserver {
         url.spec().c_str());
     chrome::GetActiveWebContents(browser)->GetRenderViewHost()->
         ExecuteJavascriptInWebFrame(string16(), UTF8ToUTF16(script));
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
 
     EXPECT_EQ(base::StringPrintf("\"%d\"", iframe_id), javascript_response_);
     registrar_.RemoveAll();
@@ -142,7 +142,7 @@ class GeolocationNotificationObserver : public content::NotificationObserver {
         "window.domAutomationController.send(geoStart());";
     render_view_host->ExecuteJavascriptInWebFrame(WideToUTF16Hack(iframe_xpath),
                                                   UTF8ToUTF16(script));
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     registrar_.RemoveAll();
     LOG(WARNING) << "got geolocation watch" << javascript_response_;
     EXPECT_NE("\"0\"", javascript_response_);
diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc
index ec567ed..5f37966 100644
--- a/chrome/browser/history/history_browsertest.cc
+++ b/chrome/browser/history/history_browsertest.cc
@@ -67,7 +67,7 @@ class HistoryEnumerator : public HistoryService::URLEnumerator {
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&HistoryService::IterateURLs, history, this));
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   virtual void OnURL(const GURL& url) {
@@ -129,7 +129,7 @@ class HistoryBrowserTest : public InProcessBrowserTest {
                             FROM_HERE,
                             base::Bind(&HistoryService::ScheduleDBTask,
                                        history, task, &request_consumer));
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   void ExpectEmptyHistory() {
diff --git a/chrome/browser/history/redirect_browsertest.cc b/chrome/browser/history/redirect_browsertest.cc
index acf461e..ddbca26 100644
--- a/chrome/browser/history/redirect_browsertest.cc
+++ b/chrome/browser/history/redirect_browsertest.cc
@@ -49,7 +49,7 @@ class RedirectTest : public InProcessBrowserTest {
         url, &consumer_,
         base::Bind(&RedirectTest::OnRedirectQueryComplete,
                    base::Unretained(this), &rv));
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     return rv;
   }
 
diff --git a/chrome/browser/importer/toolbar_importer_utils_browsertest.cc b/chrome/browser/importer/toolbar_importer_utils_browsertest.cc
index ee269463..999dbf1c 100644
--- a/chrome/browser/importer/toolbar_importer_utils_browsertest.cc
+++ b/chrome/browser/importer/toolbar_importer_utils_browsertest.cc
@@ -33,7 +33,7 @@ IN_PROC_BROWSER_TEST_F(ToolbarImporterUtilsTest, NoCrash) {
                  base::Unretained(this)),
       browser()->profile());
   if (!did_run_) {
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
   ASSERT_TRUE(did_run_);
 }
diff --git a/chrome/browser/logging_chrome_browsertest.cc b/chrome/browser/logging_chrome_browsertest.cc
index c63cb5d..1be0c147 100644
--- a/chrome/browser/logging_chrome_browsertest.cc
+++ b/chrome/browser/logging_chrome_browsertest.cc
@@ -94,6 +94,6 @@ IN_PROC_BROWSER_TEST_F(RendererCrashTest, FLAKY_Crash) {
                  content::NotificationService::AllSources());
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(chrome::kChromeUICrashURL), CURRENT_TAB, 0);
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
   ASSERT_TRUE(saw_crash_);
 }
diff --git a/chrome/browser/page_cycler/page_cycler_browsertest.cc b/chrome/browser/page_cycler/page_cycler_browsertest.cc
index c005282..b74d036 100644
--- a/chrome/browser/page_cycler/page_cycler_browsertest.cc
+++ b/chrome/browser/page_cycler/page_cycler_browsertest.cc
@@ -201,7 +201,7 @@ IN_PROC_BROWSER_TEST_F(PageCyclerBrowserTest, BasicTest) {
   InitPageCycler();
   page_cycler()->Run();
 
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
   ASSERT_FALSE(file_util::PathExists(errors_file()));
   ASSERT_TRUE(file_util::PathExists(stats_file()));
 }
@@ -230,7 +230,7 @@ IN_PROC_BROWSER_TEST_F(PageCyclerBrowserTest, UnvisitableURL) {
   InitPageCycler();
   page_cycler()->Run();
 
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
   ASSERT_TRUE(file_util::PathExists(errors_file()));
   ASSERT_TRUE(file_util::PathExists(stats_file()));
 
@@ -264,7 +264,7 @@ IN_PROC_BROWSER_TEST_F(PageCyclerBrowserTest, InvalidURL) {
   InitPageCycler();
   page_cycler()->Run();
 
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
   ASSERT_TRUE(file_util::PathExists(errors_file()));
   ASSERT_TRUE(file_util::PathExists(stats_file()));
 
@@ -297,7 +297,7 @@ IN_PROC_BROWSER_TEST_F(PageCyclerBrowserTest, ChromeErrorURL) {
   InitPageCycler();
   page_cycler()->Run();
 
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
   ASSERT_TRUE(file_util::PathExists(errors_file()));
   ASSERT_TRUE(file_util::PathExists(stats_file()));
 
@@ -334,7 +334,7 @@ IN_PROC_BROWSER_TEST_F(PageCyclerCachedBrowserTest, MAYBE_PlaybackMode) {
 
   page_cycler()->Run();
 
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
   ASSERT_TRUE(file_util::PathExists(stats_file()));
   ASSERT_FALSE(file_util::PathExists(errors_file()));
 }
@@ -370,7 +370,7 @@ IN_PROC_BROWSER_TEST_F(PageCyclerCachedBrowserTest, MAYBE_URLNotInCache) {
   InitPageCycler(new_urls_file, errors_file(), stats_file());
   page_cycler()->Run();
 
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
   ASSERT_TRUE(file_util::PathExists(errors_file()));
   ASSERT_TRUE(file_util::PathExists(stats_file()));
 
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index dc8c457..cdc8a99 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -268,7 +268,7 @@ class TestPrerenderContents : public PrerenderContents {
   void WaitForPendingPrerenders(size_t expected_pending_prerenders) {
     if (pending_prerenders().size() < expected_pending_prerenders) {
       expected_pending_prerenders_ = expected_pending_prerenders;
-      ui_test_utils::RunMessageLoop();
+      content::RunMessageLoop();
       expected_pending_prerenders_ = 0;
     }
 
@@ -910,7 +910,7 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
         loader_url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED,
         false));
 
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     // Now that we've run the prerender until it stopped loading, we can now
     // also make sure the launcher has finished loading.
     loader_nav_observer.Wait();
@@ -1011,7 +1011,7 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
 
     if (prerender_contents->quit_message_loop_on_destruction()) {
     // Run message loop until the prerender contents is destroyed.
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     } else {
       // We don't expect to pick up a running prerender, so instead
       // observe one navigation.
@@ -1702,7 +1702,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderRendererCrash) {
           content::Referrer(),
           content::PAGE_TRANSITION_TYPED,
           std::string());
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
@@ -2134,7 +2134,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearHistory) {
       FROM_HERE,
       base::Bind(&ClearBrowsingData, current_browser(),
                  BrowsingDataRemover::REMOVE_HISTORY));
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 
   // Make sure prerender history was cleared.
   EXPECT_EQ(0, GetHistoryLength());
@@ -2152,7 +2152,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearCache) {
   MessageLoop::current()->PostTask(FROM_HERE,
       base::Bind(&ClearBrowsingData, current_browser(),
                  BrowsingDataRemover::REMOVE_CACHE));
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 
   // Make sure prerender history was not cleared.  Not a vital behavior, but
   // used to compare with PrerenderClearHistory test.
@@ -2167,7 +2167,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelAll) {
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&CancelAllPrerenders, GetPrerenderManager()));
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
   EXPECT_TRUE(GetPrerenderContents() == NULL);
 }
 
diff --git a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
index 39bca57..274ee5e 100644
--- a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
+++ b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
@@ -336,7 +336,7 @@ class CloudPrintProxyPolicyStartupTest : public base::MultiProcessTest,
       if (seen_)
         return;
       running_ = true;
-      ui_test_utils::RunMessageLoop();
+      content::RunMessageLoop();
     }
 
     void Notify() {
diff --git a/chrome/browser/printing/print_dialog_cloud_interative_uitest.cc b/chrome/browser/printing/print_dialog_cloud_interative_uitest.cc
index 1a3bfa9..cb71eaa 100644
--- a/chrome/browser/printing/print_dialog_cloud_interative_uitest.cc
+++ b/chrome/browser/printing/print_dialog_cloud_interative_uitest.cc
@@ -244,7 +244,7 @@ IN_PROC_BROWSER_TEST_F(PrintDialogCloudTest, MAYBE_HandlersRegistered) {
 
   TestController::GetInstance()->set_use_delegate(true);
 
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 
   ASSERT_TRUE(TestController::GetInstance()->result());
 
diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc
index 1e30616..493fbf9 100644
--- a/chrome/browser/printing/printing_layout_browsertest.cc
+++ b/chrome/browser/printing/printing_layout_browsertest.cc
@@ -67,7 +67,7 @@ class PrintingLayoutTest : public PrintingTest<InProcessBrowserTest>,
 
     TabContents* tab = chrome::GetActiveTabContents(browser());
     tab->print_view_manager()->PrintNow();
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     registrar_.RemoveAll();
   }
 
diff --git a/chrome/browser/profiles/profile_manager_browsertest.cc b/chrome/browser/profiles/profile_manager_browsertest.cc
index 071b73b..6580f28 100644
--- a/chrome/browser/profiles/profile_manager_browsertest.cc
+++ b/chrome/browser/profiles/profile_manager_browsertest.cc
@@ -78,7 +78,7 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, MAYBE_DeleteAllProfiles) {
 
   // Spin to allow profile creation to take place, loop is terminated
   // by OnUnblockOnProfileCreation when the profile is created.
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 
   ASSERT_EQ(cache.GetNumberOfProfiles(), 2U);
 
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_;
   }
 
diff --git a/chrome/browser/search_engines/template_url_scraper_unittest.cc b/chrome/browser/search_engines/template_url_scraper_unittest.cc
index c279f8b..be62ded 100644
--- a/chrome/browser/search_engines/template_url_scraper_unittest.cc
+++ b/chrome/browser/search_engines/template_url_scraper_unittest.cc
@@ -31,7 +31,7 @@ class TemplateURLServiceLoader : public content::NotificationObserver {
     registrar_.Add(this, chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
                    content::Source<TemplateURLService>(model));
     model_->Load();
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   virtual void Observe(int type,
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());
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index be44461..6be999e 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -55,7 +55,7 @@ class ProvisionalLoadWaiter : public content::WebContentsObserver {
       return;
 
     waiting_ = true;
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   void DidFailProvisionalLoad(
@@ -177,7 +177,7 @@ class SSLUITest : public InProcessBrowserTest {
           FROM_HERE,
           MessageLoop::QuitClosure(),
           base::TimeDelta::FromMilliseconds(timeout_ms));
-      ui_test_utils::RunMessageLoop();
+      content::RunMessageLoop();
     }
 
     bool actuallyLoadedContent = false;
@@ -1019,7 +1019,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestCloseTabWithUnsafePopup) {
       break;
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE, MessageLoop::QuitClosure(), base::TimeDelta::FromSeconds(1));
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
   ASSERT_EQ(1, GetConstrainedWindowCount());
 
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc
index 55aacdb..b2631a1 100644
--- a/chrome/browser/sync/test/integration/bookmarks_helper.cc
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc
@@ -42,12 +42,12 @@ class FaviconChangeObserver : public BookmarkModelObserver {
   }
   void WaitForGetFavicon() {
     wait_for_load_ = true;
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     ASSERT_TRUE(node_->is_favicon_loaded());
   }
   void WaitForSetFavicon() {
     wait_for_load_ = false;
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
   virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE {}
   virtual void BookmarkNodeMoved(BookmarkModel* model,
diff --git a/chrome/browser/sync/test/integration/passwords_helper.cc b/chrome/browser/sync/test/integration/passwords_helper.cc
index a8f66f7..bd94344 100644
--- a/chrome/browser/sync/test/integration/passwords_helper.cc
+++ b/chrome/browser/sync/test/integration/passwords_helper.cc
@@ -88,7 +88,7 @@ void GetLogins(PasswordStore* store, std::vector<PasswordForm>& matches) {
   matcher_form.signon_realm = kFakeSignonRealm;
   PasswordStoreConsumerHelper consumer(&matches);
   store->GetLogins(matcher_form, &consumer);
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 void RemoveLogin(PasswordStore* store, const PasswordForm& form) {
diff --git a/chrome/browser/sync/test/integration/sessions_helper.cc b/chrome/browser/sync/test/integration/sessions_helper.cc
index e304a12..32221f4 100644
--- a/chrome/browser/sync/test/integration/sessions_helper.cc
+++ b/chrome/browser/sync/test/integration/sessions_helper.cc
@@ -139,7 +139,7 @@ bool WaitForTabsToLoad(int index, const std::vector<GURL>& urls) {
         ProfileSyncServiceFactory::GetInstance()->GetForProfile(
             test()->GetProfile(index))->GetSessionModelAssociator()->
             BlockUntilLocalChangeForTest(TestTimeouts::action_max_timeout());
-        ui_test_utils::RunMessageLoop();
+        content::RunMessageLoop();
       }
     }
   }
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 8bab5a9..da07fd4 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -568,7 +568,7 @@ bool SyncTest::IsTestServerRunning() {
                         net::LOAD_DO_NOT_SAVE_COOKIES);
   fetcher->SetRequestContext(g_browser_process->system_request_context());
   fetcher->Start();
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
   return delegate.running();
 }
 
diff --git a/chrome/browser/task_manager/task_manager_browsertest_util.cc b/chrome/browser/task_manager/task_manager_browsertest_util.cc
index d8b2cfb..1a19ab5 100644
--- a/chrome/browser/task_manager/task_manager_browsertest_util.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest_util.cc
@@ -66,7 +66,7 @@ void TaskManagerBrowserTestUtil::WaitForResourceChange(int target_count) {
     return;
   }
 
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
   model->RemoveObserver(&observer);
 }
 
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
index 302e299..48053ab 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
@@ -143,7 +143,7 @@ class WebIntentPickerMock : public WebIntentPicker,
   void Wait() {
     if (!pending_async_completed_) {
       message_loop_started_ = true;
-      ui_test_utils::RunMessageLoop();
+      content::RunMessageLoop();
       pending_async_completed_ = false;
     }
   }
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index e7b2905..4263f24 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -231,7 +231,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
         content::NotificationService::AllSources());
 
     while (!HasFailure() && browser->tab_count() != expected_tab_count)
-      ui_test_utils::RunMessageLoop();
+      content::RunMessageLoop();
 
     ASSERT_EQ(expected_tab_count, browser->tab_count());
   }
@@ -257,7 +257,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
                   content::Source<AutocompleteController>(controller));
 
     while (!HasFailure() && !controller->done())
-      ui_test_utils::RunMessageLoop();
+      content::RunMessageLoop();
 
     ASSERT_TRUE(controller->done());
   }
@@ -273,7 +273,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
       registrar.Add(this, chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
                     content::Source<TemplateURLService>(model));
       model->Load();
-      ui_test_utils::RunMessageLoop();
+      content::RunMessageLoop();
     }
 
     ASSERT_TRUE(model->loaded());
@@ -307,7 +307,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
       content::NotificationRegistrar registrar;
       registrar.Add(this, chrome::NOTIFICATION_HISTORY_LOADED,
                     content::Source<Profile>(profile));
-      ui_test_utils::RunMessageLoop();
+      content::RunMessageLoop();
     }
 
     BookmarkModel* bookmark_model = profile->GetBookmarkModel();
@@ -317,7 +317,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
       content::NotificationRegistrar registrar;
       registrar.Add(this, chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED,
                     content::Source<Profile>(profile));
-      ui_test_utils::RunMessageLoop();
+      content::RunMessageLoop();
     }
 
     GURL url(entry.url);
@@ -335,7 +335,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
       content::NotificationRegistrar registrar;
       registrar.Add(this, chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
                     content::Source<Profile>(profile));
-      ui_test_utils::RunMessageLoop();
+      content::RunMessageLoop();
       // We don't want to return until all observers have processed this
       // notification, because some (e.g. the in-memory history database) may do
       // something important.  Since we don't know where in the observer list we
diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
index 03d7d97..8ce10bc 100644
--- a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
+++ b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
@@ -93,5 +93,5 @@ IN_PROC_BROWSER_TEST_F(TabModalConfirmDialogTest, Quit) {
   EXPECT_CALL(*delegate_, OnCanceled());
   MessageLoopForUI::current()->PostTask(FROM_HERE,
                                         base::Bind(&browser::AttemptExit));
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 }
diff --git a/chrome/browser/ui/views/keyboard_access_browsertest.cc b/chrome/browser/ui/views/keyboard_access_browsertest.cc
index 976f832..7243d49 100644
--- a/chrome/browser/ui/views/keyboard_access_browsertest.cc
+++ b/chrome/browser/ui/views/keyboard_access_browsertest.cc
@@ -52,7 +52,7 @@ class ViewFocusChangeWaiter : public views::FocusChangeListener {
   }
 
   void Wait() {
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
  private:
diff --git a/chrome/browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc b/chrome/browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc
index 20e992f..40aa3cc 100644
--- a/chrome/browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc
+++ b/chrome/browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc
@@ -74,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewBrowserTest, DISABLED_OkButton) {
 
   // View should no longer be showing.  The message loop will exit once the
   // fade animation of the bubble is done.
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
   EXPECT_TRUE(on_start_sync_called_);
   EXPECT_EQ(OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS, mode_);
   EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
@@ -93,7 +93,7 @@ IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewBrowserTest,
 
   // View should no longer be showing.  The message loop will exit once the
   // fade animation of the bubble is done.
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
   EXPECT_FALSE(on_start_sync_called_);
   EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
 }
@@ -108,7 +108,7 @@ IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewBrowserTest,
   listener->LinkClicked(view->advanced_link_, 0);
 
   // View should no longer be showing and a new tab should be opened.
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
   EXPECT_TRUE(on_start_sync_called_);
   EXPECT_EQ(OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST, mode_);
   EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
@@ -126,7 +126,7 @@ IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewBrowserTest,
 
   // View should no longer be showing.  The message loop will exit once the
   // fade animation of the bubble is done.
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
   EXPECT_TRUE(on_start_sync_called_);
   EXPECT_EQ(OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS, mode_);
   EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
@@ -144,7 +144,7 @@ IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewBrowserTest,
 
   // View should no longer be showing.  The message loop will exit once the
   // fade animation of the bubble is done.
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
   EXPECT_FALSE(on_start_sync_called_);
   EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
 }
diff --git a/chrome/browser/ui/views/web_dialog_view_browsertest.cc b/chrome/browser/ui/views/web_dialog_view_browsertest.cc
index f0d4f73..676734e 100644
--- a/chrome/browser/ui/views/web_dialog_view_browsertest.cc
+++ b/chrome/browser/ui/views/web_dialog_view_browsertest.cc
@@ -121,7 +121,7 @@ IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, MAYBE_SizeWindow) {
   set_bounds.set_height(300);
 
   view->MoveContents(web_contents, set_bounds);
-  ui_test_utils::RunMessageLoop();  // TestWebDialogView will quit.
+  content::RunMessageLoop();  // TestWebDialogView will quit.
   actual_bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
   EXPECT_EQ(set_bounds, actual_bounds);
 
@@ -137,7 +137,7 @@ IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, MAYBE_SizeWindow) {
   set_bounds.set_height(250);
 
   view->MoveContents(web_contents, set_bounds);
-  ui_test_utils::RunMessageLoop();  // TestWebDialogView will quit.
+  content::RunMessageLoop();  // TestWebDialogView will quit.
   actual_bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
   EXPECT_EQ(set_bounds, actual_bounds);
 
@@ -153,7 +153,7 @@ IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, MAYBE_SizeWindow) {
   set_bounds.set_size(min_size);
 
   view->MoveContents(web_contents, set_bounds);
-  ui_test_utils::RunMessageLoop();  // TestWebDialogView will quit.
+  content::RunMessageLoop();  // TestWebDialogView will quit.
   actual_bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
   EXPECT_EQ(set_bounds, actual_bounds);
 
@@ -169,7 +169,7 @@ IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, MAYBE_SizeWindow) {
   set_bounds.set_height(0);
 
   view->MoveContents(web_contents, set_bounds);
-  ui_test_utils::RunMessageLoop();  // TestWebDialogView will quit.
+  content::RunMessageLoop();  // TestWebDialogView will quit.
   actual_bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
   EXPECT_LT(0, actual_bounds.width());
   EXPECT_LT(0, actual_bounds.height());
diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
index 7c80470..5400353 100644
--- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
+++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
@@ -70,7 +70,7 @@ void ReloadLocaleResources(const std::string& new_locale) {
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&ReloadLocaleResourcesOnIOThread, base::ConstRef(new_locale)),
       MessageLoop::QuitClosure());
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 }  // namespace
diff --git a/chrome/browser/ui/webui/web_ui_browsertest.cc b/chrome/browser/ui/webui/web_ui_browsertest.cc
index 74df314..d8d0f73 100644
--- a/chrome/browser/ui/webui/web_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/web_ui_browsertest.cc
@@ -205,7 +205,7 @@ void WebUIBrowserTest::BrowsePreload(const GURL& browse_to) {
   params.disposition = CURRENT_TAB;
   chrome::Navigate(&params);
   navigation_observer.WaitForObservation(
-      base::Bind(&ui_test_utils::RunMessageLoop),
+      base::Bind(&content::RunMessageLoop),
       base::Bind(&MessageLoop::Quit,
                  base::Unretained(MessageLoopForUI::current())));
 }
@@ -217,7 +217,7 @@ void WebUIBrowserTest::BrowsePrintPreload(const GURL& browse_to) {
       browser()->tab_strip_model(), this);
   chrome::Print(browser());
   tabstrip_observer.WaitForObservation(
-      base::Bind(&ui_test_utils::RunMessageLoop),
+      base::Bind(&content::RunMessageLoop),
       base::Bind(&MessageLoop::Quit,
                  base::Unretained(MessageLoopForUI::current())));
 
diff --git a/chrome/browser/ui/webui/web_ui_test_handler.cc b/chrome/browser/ui/webui/web_ui_test_handler.cc
index 400ea4d..cbb2d42 100644
--- a/chrome/browser/ui/webui/web_ui_test_handler.cc
+++ b/chrome/browser/ui/webui/web_ui_test_handler.cc
@@ -105,13 +105,13 @@ bool WebUITestHandler::WaitForResult() {
 
   // Either sync test completion or the testDone() will cause message loop
   // to quit.
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 
   // Run a second message loop when not |run_test_done_| so that the sync test
   // completes, or |run_test_succeeded_| but not |test_done_| so async tests
   // complete.
   if (!run_test_done_ || (run_test_succeeded_ && !test_done_)) {
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   is_waiting_ = false;
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index 7897f61..07ef49c 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -379,7 +379,7 @@ void InProcessBrowserTest::QuitBrowsers() {
   // shut down properly.
   MessageLoopForUI::current()->PostTask(FROM_HERE,
                                         base::Bind(&browser::AttemptExit));
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 
 #if defined(OS_MACOSX)
   // browser::AttemptExit() will attempt to close all browsers by deleting
diff --git a/chrome/test/base/in_process_browser_test.h b/chrome/test/base/in_process_browser_test.h
index 6b1f0d9..9b25934 100644
--- a/chrome/test/base/in_process_browser_test.h
+++ b/chrome/test/base/in_process_browser_test.h
@@ -48,9 +48,9 @@ class RuleBasedHostResolverProc;
 // . Your test method is invoked on the ui thread. If you need to block until
 //   state changes you'll need to run the message loop from your test method.
 //   For example, if you need to wait till a find bar has completely been shown
-//   you'll need to invoke ui_test_utils::RunMessageLoop. When the message bar
-//   is shown, invoke MessageLoop::current()->Quit() to return control back to
-//   your test method.
+//   you'll need to invoke content::RunMessageLoop. When the message bar is
+//   shown, invoke MessageLoop::current()->Quit() to return control back to your
+//   test method.
 // . If you subclass and override SetUp, be sure and invoke
 //   InProcessBrowserTest::SetUp. (But see also SetUpOnMainThread,
 //   SetUpInProcessBrowserTestFixture and other related hook methods for a
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc
index 4d8afc6..ef155f6 100644
--- a/chrome/test/base/ui_test_utils.cc
+++ b/chrome/test/base/ui_test_utils.cc
@@ -148,21 +148,16 @@ void RunAllPendingMessageAndSendQuit(content::BrowserThread::ID thread_id,
                                      const base::Closure& quit_task) {
   MessageLoop::current()->PostTask(FROM_HERE,
                                    MessageLoop::QuitWhenIdleClosure());
-  RunMessageLoop();
+  content::RunMessageLoop();
   content::BrowserThread::PostTask(thread_id, FROM_HERE, quit_task);
 }
 
 }  // namespace
 
-void RunMessageLoop() {
-  base::RunLoop run_loop;
-  content::RunThisRunLoop(&run_loop);
-}
-
 void RunAllPendingInMessageLoop() {
   MessageLoop::current()->PostTask(FROM_HERE,
                                    MessageLoop::QuitWhenIdleClosure());
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 void RunAllPendingInMessageLoop(content::BrowserThread::ID thread_id) {
@@ -381,7 +376,7 @@ void RegisterAndWait(content::NotificationObserver* observer,
                      const content::NotificationSource& source) {
   content::NotificationRegistrar registrar;
   registrar.Add(observer, type, source);
-  RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 void WaitForBookmarkModelToLoad(BookmarkModel* model) {
diff --git a/chrome/test/base/ui_test_utils.h b/chrome/test/base/ui_test_utils.h
index 66af350..486747a 100644
--- a/chrome/test/base/ui_test_utils.h
+++ b/chrome/test/base/ui_test_utils.h
@@ -81,11 +81,6 @@ enum BrowserTestWaitFlags {
                       BROWSER_TEST_WAIT_FOR_NAVIGATION
 };
 
-// Turns on nestable tasks, runs the message loop, then resets nestable tasks
-// to what they were originally. Prefer this over MessageLoop::Run for in
-// process browser tests that need to block until a condition is met.
-void RunMessageLoop();
-
 // Turns on nestable tasks, runs all pending tasks in the message loop,
 // then resets nestable tasks to what they were originally. Prefer this
 // over MessageLoop::RunAllPending for in process browser tests to run
diff --git a/chrome/test/base/ui_test_utils_aura.cc b/chrome/test/base/ui_test_utils_aura.cc
index 47d4674..20a418f 100644
--- a/chrome/test/base/ui_test_utils_aura.cc
+++ b/chrome/test/base/ui_test_utils_aura.cc
@@ -40,7 +40,7 @@ void ClickOnView(const Browser* browser, ViewID vid) {
       ui_controls::LEFT,
       ui_controls::DOWN | ui_controls::UP,
       MessageLoop::QuitClosure());
-  RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 void HideNativeWindow(gfx::NativeWindow window) {
diff --git a/chrome/test/base/ui_test_utils_gtk.cc b/chrome/test/base/ui_test_utils_gtk.cc
index d4c5abb..d493447 100644
--- a/chrome/test/base/ui_test_utils_gtk.cc
+++ b/chrome/test/base/ui_test_utils_gtk.cc
@@ -58,7 +58,7 @@ void ClickOnView(const Browser* browser, ViewID vid) {
       ui_controls::LEFT,
       ui_controls::DOWN | ui_controls::UP,
       MessageLoop::QuitClosure());
-  RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 void HideNativeWindow(gfx::NativeWindow window) {
diff --git a/chrome/test/base/ui_test_utils_mac.mm b/chrome/test/base/ui_test_utils_mac.mm
index 816a151..706fbd2 100644
--- a/chrome/test/base/ui_test_utils_mac.mm
+++ b/chrome/test/base/ui_test_utils_mac.mm
@@ -49,7 +49,7 @@ void ClickOnView(const Browser* browser, ViewID vid) {
       ui_controls::LEFT,
       ui_controls::DOWN | ui_controls::UP,
       MessageLoop::QuitClosure());
-  RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 void HideNativeWindow(gfx::NativeWindow window) {
diff --git a/chrome/test/base/ui_test_utils_win.cc b/chrome/test/base/ui_test_utils_win.cc
index da8dbed..e50c9b0 100644
--- a/chrome/test/base/ui_test_utils_win.cc
+++ b/chrome/test/base/ui_test_utils_win.cc
@@ -75,7 +75,7 @@ void ClickOnView(const Browser* browser, ViewID vid) {
       ui_controls::LEFT,
       ui_controls::DOWN | ui_controls::UP,
       MessageLoop::QuitClosure());
-  RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 void HideNativeWindow(gfx::NativeWindow window) {
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index 117fd0e..b249cd1 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -159,7 +159,7 @@ void ViewEventTestBase::StartMessageLoopAndRunTest() {
       FROM_HERE,
       base::Bind(&ViewEventTestBase::DoTestOnMessageLoop, this));
 
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 gfx::Size ViewEventTestBase::GetPreferredSize() {
diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc
index ba9639f..f1a7740 100644
--- a/chrome/test/ppapi/ppapi_test.cc
+++ b/chrome/test/ppapi/ppapi_test.cc
@@ -73,7 +73,7 @@ PPAPITestBase::TestFinishObserver::TestFinishObserver(
 bool PPAPITestBase::TestFinishObserver::WaitForFinish() {
   if (!finished_) {
     waiting_ = true;
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
     waiting_ = false;
   }
   return finished_;
diff --git a/content/browser/download/mhtml_generation_browsertest.cc b/content/browser/download/mhtml_generation_browsertest.cc
index c7cc1f5..0eb2a0d 100644
--- a/content/browser/download/mhtml_generation_browsertest.cc
+++ b/content/browser/download/mhtml_generation_browsertest.cc
@@ -58,8 +58,7 @@ IN_PROC_BROWSER_TEST_F(MHTMLGenerationTest, GenerateMHTML) {
       path, base::Bind(&MHTMLGenerationTest::MHTMLGenerated, this));
 
   // Block until the MHTML is generated.
-  base::RunLoop run_loop;
-  RunThisRunLoop(&run_loop);
+  content::RunMessageLoop();
 
   EXPECT_TRUE(mhtml_generated());
   EXPECT_GT(file_size(), 0);
diff --git a/content/browser/indexed_db/idbbindingutilities_browsertest.cc b/content/browser/indexed_db/idbbindingutilities_browsertest.cc
index 43babf1..e959ae3 100644
--- a/content/browser/indexed_db/idbbindingutilities_browsertest.cc
+++ b/content/browser/indexed_db/idbbindingutilities_browsertest.cc
@@ -242,19 +242,19 @@ class IDBKeyPathHelper : public UtilityProcessHostClient {
 // This test fixture runs in the UI thread. However, most of the work done by
 // UtilityProcessHost (and wrapped by IDBKeyPathHelper above) happens on the IO
 // thread. This fixture delegates to IDBKeyPathHelper and blocks via
-// "ui_test_utils::RunMessageLoop()", until IDBKeyPathHelper posts a quit
+// "content::RunMessageLoop()", until IDBKeyPathHelper posts a quit
 // message the MessageLoop.
 class ScopedIDBKeyPathHelper {
  public:
   ScopedIDBKeyPathHelper() {
     key_path_helper_ = new IDBKeyPathHelper();
     key_path_helper_->CreateUtilityProcess();
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   ~ScopedIDBKeyPathHelper() {
     key_path_helper_->DestroyUtilityProcess();
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   void SetExpectedKeys(int id,
@@ -274,14 +274,14 @@ class ScopedIDBKeyPathHelper {
       const IndexedDBKeyPath& key_path) {
     key_path_helper_->CheckValuesForKeyPath(id, serialized_script_values,
                                             key_path);
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
   void CheckInjectValue(const IndexedDBKey& key,
                         const SerializedScriptValue& value,
                         const IndexedDBKeyPath& key_path) {
     key_path_helper_->CheckInjectValue(key, value, key_path);
-    ui_test_utils::RunMessageLoop();
+    content::RunMessageLoop();
   }
 
  private:
diff --git a/content/browser/plugin_data_remover_impl_browsertest.cc b/content/browser/plugin_data_remover_impl_browsertest.cc
index c8cfbc02..a087cf4 100644
--- a/content/browser/plugin_data_remover_impl_browsertest.cc
+++ b/content/browser/plugin_data_remover_impl_browsertest.cc
@@ -49,7 +49,7 @@ IN_PROC_BROWSER_TEST_F(PluginDataRemoverTest, RemoveData) {
   base::WaitableEvent* event =
       plugin_data_remover.StartRemoving(base::Time());
   watcher.StartWatching(event, this);
-  ui_test_utils::RunMessageLoop();
+  content::RunMessageLoop();
 }
 
 }  // namespace content
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());
diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc
index 55103c5..f45eb44 100644
--- a/content/browser/worker_host/test/worker_browsertest.cc
+++ b/content/browser/worker_host/test/worker_browsertest.cc
@@ -314,8 +314,7 @@ class WorkerTest : public content::ContentBrowserTest {
           BrowserThread::IO, FROM_HERE,
           base::Bind(&CountWorkerProcesses, &cur_process_count));
 
-      base::RunLoop run_loop;
-      content::RunThisRunLoop(&run_loop);
+      content::RunMessageLoop();
       if (cur_process_count == count)
         return true;
 
diff --git a/content/public/test/test_utils.h b/content/public/test/test_utils.h
index 8b92c31..503e9af 100644
--- a/content/public/test/test_utils.h
+++ b/content/public/test/test_utils.h
@@ -18,6 +18,11 @@
 
 namespace content {
 
+// Turns on nestable tasks, runs the message loop, then resets nestable tasks
+// to what they were originally. Prefer this over MessageLoop::Run for in
+// process browser tests that need to block until a condition is met.
+void RunMessageLoop();
+
 // Variant of RunMessageLoop that takes RunLoop.
 void RunThisRunLoop(base::RunLoop* run_loop);
 
diff --git a/content/test/test_utils.cc b/content/test/test_utils.cc
index 3477057..ba93773 100644
--- a/content/test/test_utils.cc
+++ b/content/test/test_utils.cc
@@ -38,6 +38,11 @@ static void DeferredQuitRunLoop(const base::Closure& quit_task,
 
 namespace content {
 
+void RunMessageLoop() {
+  base::RunLoop run_loop;
+  RunThisRunLoop(&run_loop);
+}
+
 void RunThisRunLoop(base::RunLoop* run_loop) {
   MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());