Move RunAllPendingInMessageLoop from ui_test_utils.h to test_utils.h, so that it can be reused by content_browsertests. I put it in test_utils.h instead of browser_test_utils.h because this is also used by unit tests.

BUG=90448
Review URL: https://chromiumcodereview.appspot.com/10825085

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149026 0039d316-1c4b-4281-b951-d872f2087c98

34 files changed, 131 insertions, 131 deletions

diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index eb6fcb3..29afc94 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -561,7 +561,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) {
     // At this point the renderer has sent us a message asking to advance the
     // focus (as the end of the focus loop was reached in the renderer).
     // We need to run the message loop to process it.
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
   }
 
   // Now let's try reverse focus traversal.
@@ -613,7 +613,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) {
     // At this point the renderer has sent us a message asking to advance the
     // focus (as the end of the focus loop was reached in the renderer).
     // We need to run the message loop to process it.
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
   }
 }
 
@@ -688,7 +688,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) {
     // At this point the renderer has sent us a message asking to advance the
     // focus (as the end of the focus loop was reached in the renderer).
     // We need to run the message loop to process it.
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
   }
 
   // Now let's try reverse focus traversal.
@@ -731,7 +731,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) {
     // At this point the renderer has sent us a message asking to advance the
     // focus (as the end of the focus loop was reached in the renderer).
     // We need to run the message loop to process it.
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
   }
 }
 
@@ -878,7 +878,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReload) {
     chrome::NewTab(browser());
     observer.Wait();
   }
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   {
     content::WindowedNotificationObserver observer(
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc
index 956da4d..f58100d 100644
--- a/chrome/browser/browser_keyevents_browsertest.cc
+++ b/chrome/browser/browser_keyevents_browsertest.cc
@@ -613,7 +613,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_AccessKeys) {
   GURL url = test_server()->GetURL(kTestingPage);
   ui_test_utils::NavigateToURL(browser(), url);
 
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER));
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER));
 
@@ -635,7 +635,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_AccessKeys) {
 
   // TODO(isherman): This is an experimental change to help diagnose
   // http://crbug.com/55713
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 #if defined(USE_AURA)
   EXPECT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX));
 #else
diff --git a/chrome/browser/chromeos/extensions/file_browser_notifications_browsertest.cc b/chrome/browser/chromeos/extensions/file_browser_notifications_browsertest.cc
index 58a02d7..bd11e45 100644
--- a/chrome/browser/chromeos/extensions/file_browser_notifications_browsertest.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_notifications_browsertest.cc
@@ -77,7 +77,7 @@ IN_PROC_BROWSER_TEST_F(FileBrowserNotificationsTest, ShowDelayedTest) {
   EXPECT_FALSE(FindNotification("Dpath"));
 
   // Running the message loop should create the notification.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_EQ(1u, notifications_->GetNotificationCountForTest());
   EXPECT_TRUE(FindNotification("Dpath"));
 
@@ -93,7 +93,7 @@ IN_PROC_BROWSER_TEST_F(FileBrowserNotificationsTest, ShowDelayedTest) {
 
   // When the delayed notification is processed, it's an update, so we still
   // only have two notifications.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_EQ(2u, notifications_->GetNotificationCountForTest());
   EXPECT_TRUE(FindNotification("DFpath"));
 
@@ -110,7 +110,7 @@ IN_PROC_BROWSER_TEST_F(FileBrowserNotificationsTest, ShowDelayedTest) {
   EXPECT_FALSE(FindNotification("Fpath"));
 
   // Even after processing messages, no new notification should be added.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_EQ(2u, notifications_->GetNotificationCountForTest());
   EXPECT_TRUE(FindNotification("Dpath"));
   EXPECT_TRUE(FindNotification("DFpath"));
@@ -128,7 +128,7 @@ IN_PROC_BROWSER_TEST_F(FileBrowserNotificationsTest, HideDelayedTest) {
   EXPECT_TRUE(FindNotification("Dpath"));
 
   // Running pending messges should remove the notification.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_EQ(0u, notifications_->GetNotificationCountForTest());
 
   // Immediate show then hide results in no notification.
@@ -136,14 +136,14 @@ IN_PROC_BROWSER_TEST_F(FileBrowserNotificationsTest, HideDelayedTest) {
                                    "path");
   notifications_->HideNotification(FileBrowserNotifications::DEVICE_FAIL,
                                    "path");
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_EQ(0u, notifications_->GetNotificationCountForTest());
 
   // Delayed hide for a notification that doesn't exist does nothing.
   notifications_->HideNotificationDelayed(FileBrowserNotifications::DEVICE_FAIL,
                                           "path",
                                           base::TimeDelta::FromSeconds(0));
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_EQ(0u, notifications_->GetNotificationCountForTest());
 }
 
diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
index c2d8f70..fd63504 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -270,7 +270,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, MAYBE_ExistingUserLogin) {
       .Times(AnyNumber())
       .WillRepeatedly(Return(false));
   existing_user_controller()->Login(kUsername, kPassword);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest,
@@ -287,7 +287,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest,
       .WillRepeatedly(Return(false));
   existing_user_controller()->DoAutoEnrollment();
   existing_user_controller()->CompleteLogin(kUsername, kPassword);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest,
@@ -320,7 +320,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest,
       .Times(AnyNumber())
       .WillRepeatedly(Return(true));
   existing_user_controller()->CompleteLogin(kNewUsername, kPassword);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 }
 
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/login/network_screen_browsertest.cc b/chrome/browser/chromeos/login/network_screen_browsertest.cc
index da9f993..bafb375 100644
--- a/chrome/browser/chromeos/login/network_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/network_screen_browsertest.cc
@@ -149,7 +149,7 @@ class NetworkScreenTest : public WizardInProcessBrowserTest {
     EXPECT_CALL(*mock_network_library_, Connected())
         .WillOnce(Return(true));
     network_screen->OnContinuePressed();
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
   }
 
   scoped_ptr<MockScreenObserver> mock_screen_observer_;
diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
index 8af8561..97fa70b 100644
--- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc
+++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
@@ -64,7 +64,7 @@ class Waiter : public content::NotificationObserver {
       content::RunMessageLoop();
     }
     // Make sure all pending tasks are executed.
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
     running_ = false;
   }
 
@@ -155,17 +155,17 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestBasic) {
   tester->InjectMockAuthenticator(UserManager::kStubUser, "pass");
   EXPECT_TRUE(tester->IsLocked());
   tester->EnterPassword("fail");
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(tester->IsLocked());
   tester->EnterPassword("pass");
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   // Successful authentication simply send a unlock request to PowerManager.
   EXPECT_TRUE(tester->IsLocked());
 
   // Emulate LockScreen request from SessionManager.
   // TODO(oshima): Find out better way to handle this in mock.
   ScreenLocker::Hide();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(tester->IsLocked());
 }
 
@@ -191,9 +191,9 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestFullscreenExit) {
   }
   tester->InjectMockAuthenticator(UserManager::kStubUser, "pass");
   tester->EnterPassword("pass");
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ScreenLocker::Hide();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(tester->IsLocked());
 }
 
@@ -222,7 +222,7 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestShowTwice) {
 
   // Close the locker to match expectations.
   ScreenLocker::Hide();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(tester->IsLocked());
 }
 
@@ -242,12 +242,12 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, DISABLED_TestEscape) {
   EXPECT_EQ("password", tester->GetPassword());
   // Escape clears the password.
   SimulateKeyPress(tester->GetWidget(), ui::VKEY_ESCAPE);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_EQ("", tester->GetPassword());
 
   // Close the locker to match expectations.
   ScreenLocker::Hide();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(tester->IsLocked());
 }
 
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index 20120f9..f634070 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -161,7 +161,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowMain) {
   EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
   OnExit(ScreenObserver::EULA_ACCEPTED);
   // Let update screen smooth time process (time = 0ms).
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(),
             WizardController::default_controller()->current_screen());
@@ -190,7 +190,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorUpdate) {
   EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
   OnExit(ScreenObserver::EULA_ACCEPTED);
   // Let update screen smooth time process (time = 0ms).
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(),
             WizardController::default_controller()->current_screen());
diff --git a/chrome/browser/chromeos/ui/idle_logout_dialog_view_browsertest.cc b/chrome/browser/chromeos/ui/idle_logout_dialog_view_browsertest.cc
index f7d68e3..548a03f 100644
--- a/chrome/browser/chromeos/ui/idle_logout_dialog_view_browsertest.cc
+++ b/chrome/browser/chromeos/ui/idle_logout_dialog_view_browsertest.cc
@@ -86,7 +86,7 @@ IN_PROC_BROWSER_TEST_F(IdleLogoutDialogViewTest, ShowDialogAndCloseView) {
   EXPECT_NO_FATAL_FAILURE(ExpectOpenDialog());
 
   IdleLogoutDialogView::current_instance()->Close();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ExpectClosedDialog();
 }
 
@@ -95,7 +95,7 @@ IN_PROC_BROWSER_TEST_F(IdleLogoutDialogViewTest, ShowDialogAndCloseViewClose) {
   EXPECT_NO_FATAL_FAILURE(ExpectOpenDialog());
 
   IdleLogoutDialogView::current_instance()->Close();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   IdleLogoutDialogView::CloseDialog();
 
   ExpectClosedDialog();
@@ -122,7 +122,7 @@ IN_PROC_BROWSER_TEST_F(IdleLogoutDialogViewTest,
   IdleLogoutDialogView::ShowDialog();
   EXPECT_NO_FATAL_FAILURE(ExpectOpenDialog());
 
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ExpectClosedDialog();
 }
 
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 3acc17dc..c6ae215 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -681,8 +681,8 @@ class DownloadTest : public InProcessBrowserTest {
     }
 
     // Wait till the |DownloadFile|s are destroyed.
-    ui_test_utils::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
-    ui_test_utils::RunAllPendingInMessageLoop(content::BrowserThread::UI);
+    content::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
+    content::RunAllPendingInMessageLoop(content::BrowserThread::UI);
 
     // Validate that the correct files were downloaded.
     download_items.clear();
diff --git a/chrome/browser/download/download_danger_prompt_browsertest.cc b/chrome/browser/download/download_danger_prompt_browsertest.cc
index 4cd180a..1b98be9 100644
--- a/chrome/browser/download/download_danger_prompt_browsertest.cc
+++ b/chrome/browser/download/download_danger_prompt_browsertest.cc
@@ -52,7 +52,7 @@ class DownloadDangerPromptTest : public InProcessBrowserTest {
   }
 
   void VerifyExpectations() {
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
     // At the end of each test, we expect no more activity from the prompt. The
     // prompt shouldn't exist anymore either.
     EXPECT_TRUE(did_receive_callback_);
@@ -89,7 +89,7 @@ class DownloadDangerPromptTest : public InProcessBrowserTest {
                    DownloadDangerPrompt::ACCEPT),
         base::Bind(&DownloadDangerPromptTest::PromptCallback, this,
                    DownloadDangerPrompt::CANCEL));
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
   }
 
   void PromptCallback(DownloadDangerPrompt::Action action) {
diff --git a/chrome/browser/extensions/api/declarative/declarative_apitest.cc b/chrome/browser/extensions/api/declarative/declarative_apitest.cc
index 1e7bac01..4ae46a4 100644
--- a/chrome/browser/extensions/api/declarative/declarative_apitest.cc
+++ b/chrome/browser/extensions/api/declarative/declarative_apitest.cc
@@ -59,7 +59,7 @@ IN_PROC_BROWSER_TEST_F(DeclarativeApiTest, DeclarativeApi) {
       base::Bind(base::IgnoreResult(&RulesRegistry::GetAllRules),
                  rules_registry, extension_id, &known_rules));
 
-  ui_test_utils::RunAllPendingInMessageLoop(rules_registry->GetOwnerThread());
+  content::RunAllPendingInMessageLoop(rules_registry->GetOwnerThread());
 
   EXPECT_TRUE(known_rules.empty());
 }
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
index fca8ecd..ec91c4e 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
@@ -968,7 +968,7 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
   // be able to query the file icon.
   download_item->Cancel(true);
   // Let cleanup complete on the FILE thread.
-  ui_test_utils::RunAllPendingInMessageLoop(BrowserThread::FILE);
+  content::RunAllPendingInMessageLoop(BrowserThread::FILE);
   args = base::StringPrintf("[%d, {\"size\": 32}]", download_item->GetId());
   EXPECT_TRUE(RunFunctionAndReturnString(new DownloadsGetFileIconFunction(),
                                          args, &result_string));
diff --git a/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc b/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc
index 6abfd18..33d450b 100644
--- a/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc
+++ b/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc
@@ -58,7 +58,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionPageCaptureApiTest, MAYBE_SaveAsMHTML) {
   ASSERT_TRUE(RunExtensionTest("page_capture")) << message_;
   ASSERT_FALSE(delegate.temp_file_.empty());
   // Flush the message loops to make sure the delete happens.
-  ui_test_utils::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
-  ui_test_utils::RunAllPendingInMessageLoop(content::BrowserThread::IO);
+  content::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
+  content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
   ASSERT_FALSE(file_util::PathExists(delegate.temp_file_));
 }
diff --git a/chrome/browser/extensions/api/tabs/tabs_test.cc b/chrome/browser/extensions/api/tabs/tabs_test.cc
index 613d5e2..00b147c 100644
--- a/chrome/browser/extensions/api/tabs/tabs_test.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_test.cc
@@ -444,7 +444,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DISABLED_QueryLastFocusedWindowTabs) {
 #endif
 
   // Needed on Mac and Linux so that the BrowserWindow::IsActive calls work.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   GURL url;
   AddTabAtIndexToBrowser(focused_window, 0, url, content::PAGE_TRANSITION_LINK);
diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc
index 6204b1d..9e70eb6 100644
--- a/chrome/browser/extensions/window_open_apitest.cc
+++ b/chrome/browser/extensions/window_open_apitest.cc
@@ -52,7 +52,7 @@ void WaitForTabsAndPopups(Browser* browser,
         browser->tab_count() == num_tabs)
       break;
 
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
   }
 
   EXPECT_EQ(num_browsers, browser::GetBrowserCount(browser->profile()));
diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc
index f11d8df..29f5678 100644
--- a/chrome/browser/history/android/android_provider_backend_unittest.cc
+++ b/chrome/browser/history/android/android_provider_backend_unittest.cc
@@ -492,7 +492,7 @@ TEST_F(AndroidProviderBackendTest, InsertHistoryAndBookmark) {
   EXPECT_EQ(row1.title(),
             delegate_.modified_details()->changed_urls[0].title());
   EXPECT_FALSE(delegate_.favicon_details());
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
   const BookmarkNode* child = bookmark_model_->mobile_node()->GetChild(0);
   ASSERT_TRUE(child);
@@ -593,7 +593,7 @@ TEST_F(AndroidProviderBackendTest, DeleteHistoryAndBookmarks) {
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row1));
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row2));
   // Verify the row1 has been added in bookmark model.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
   const BookmarkNode* child = bookmark_model_->mobile_node()->GetChild(0);
   ASSERT_TRUE(child);
@@ -608,7 +608,7 @@ TEST_F(AndroidProviderBackendTest, DeleteHistoryAndBookmarks) {
                                                  &deleted_count));
   EXPECT_EQ(1, deleted_count);
   // Verify the row1 was removed from bookmark model.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ASSERT_EQ(0, bookmark_model_->mobile_node()->child_count());
 
   // Verify notifications
@@ -784,7 +784,7 @@ TEST_F(AndroidProviderBackendTest, UpdateURL) {
   ASSERT_TRUE(id2);
 
   // Verify the row1 has been added in bookmark model.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
   const BookmarkNode* child = bookmark_model_->mobile_node()->GetChild(0);
   ASSERT_TRUE(child);
@@ -861,7 +861,7 @@ TEST_F(AndroidProviderBackendTest, UpdateURL) {
   EXPECT_EQ(id1, android_url_row1.id);
 
   // Verify the bookmark model was updated.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
   const BookmarkNode* child1 = bookmark_model_->mobile_node()->GetChild(0);
   ASSERT_TRUE(child1);
@@ -1550,7 +1550,7 @@ TEST_F(AndroidProviderBackendTest, DeleteHistory) {
   ASSERT_TRUE(id2);
 
   // Verify the row1 has been added in bookmark model.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
   const BookmarkNode* child = bookmark_model_->mobile_node()->GetChild(0);
   ASSERT_TRUE(child);
@@ -1572,7 +1572,7 @@ TEST_F(AndroidProviderBackendTest, DeleteHistory) {
   EXPECT_EQ(Time::UnixEpoch(), url_row.last_visit());
 
   // Verify the row1 is still in bookmark model.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
   const BookmarkNode* child1 = bookmark_model_->mobile_node()->GetChild(0);
   ASSERT_TRUE(child1);
@@ -1708,7 +1708,7 @@ TEST_F(AndroidProviderBackendTest, AndroidCTSComplianceFolderColumnExists) {
   ASSERT_TRUE(id1);
   AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2);
   ASSERT_TRUE(id2);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   // Query by folder=0, the row1 should returned.
   std::vector<HistoryAndBookmarkRow::ColumnID> projections;
diff --git a/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc b/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc
index e2f1682..89d4cb2 100644
--- a/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc
+++ b/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc
@@ -63,7 +63,7 @@ class BookmarkModelSQLHandlerTest : public testing::Test {
   // Runs the MessageLoopForUI, and return till all pending messages were
   // processed.
   void RunMessageLoopForUI() {
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
   }
 
   TestingProfileManager profile_manager_;
diff --git a/chrome/browser/metrics/metrics_service_browsertest.cc b/chrome/browser/metrics/metrics_service_browsertest.cc
index c58d810..d6fb86e 100644
--- a/chrome/browser/metrics/metrics_service_browsertest.cc
+++ b/chrome/browser/metrics/metrics_service_browsertest.cc
@@ -93,7 +93,7 @@ IN_PROC_BROWSER_TEST_F(MetricsServiceTest, MAYBE_CrashRenderers) {
   // simultaneously... so busy waiting here shouldn't be too bad.
   const PrefService* prefs = g_browser_process->local_state();
   while (!prefs->GetInteger(prefs::kStabilityRendererCrashCount)) {
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
   }
 
   // Verify that the expected stability metrics were recorded.
diff --git a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
index 512c397..bc71be8 100644
--- a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
+++ b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
@@ -158,7 +158,7 @@ class PerformanceMonitorBrowserTest : public ExtensionBrowserTest {
     // Ensure that any event insertions happen prior to getting events in order
     // to avoid race conditions.
     content::BrowserThread::GetBlockingPool()->FlushForTesting();
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
 
     std::vector<linked_ptr<Event> > events;
     content::BrowserThread::PostBlockingPoolSequencedTask(
diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc
index 493fbf9..6aa328b 100644
--- a/chrome/browser/printing/printing_layout_browsertest.cc
+++ b/chrome/browser/printing/printing_layout_browsertest.cc
@@ -430,7 +430,7 @@ IN_PROC_BROWSER_TEST_F(PrintingLayoutTest, DISABLED_Delayed) {
     ui_test_utils::NavigateToURL(browser(), url);
   }
   chrome::CloseWindow(browser());
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   EXPECT_EQ(0., CompareWithResult(L"popup_delayed_print"))
       << L"popup_delayed_print";
@@ -458,7 +458,7 @@ IN_PROC_BROWSER_TEST_F(PrintingLayoutTest, DISABLED_IFrame) {
     ui_test_utils::NavigateToURL(browser(), url);
   }
   chrome::CloseWindow(browser());
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   EXPECT_EQ(0., CompareWithResult(L"iframe")) << L"iframe";
 }
diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc
index 752f253..1fdadbc 100644
--- a/chrome/browser/profiles/profile_browsertest.cc
+++ b/chrome/browser/profiles/profile_browsertest.cc
@@ -148,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, ProfileReadmeCreated) {
       content::Source<Profile>(profile.get()));
   observer.Wait();
 
-  ui_test_utils::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
+  content::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
 
   // Verify that README exists.
   EXPECT_TRUE(file_util::PathExists(
@@ -173,6 +173,6 @@ IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, ProfileDeletedBeforeReadmeCreated) {
   // Delete the Profile instance and run pending tasks (this includes the task
   // for README creation).
   profile.reset();
-  ui_test_utils::RunAllPendingInMessageLoop();
-  ui_test_utils::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
+  content::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
 }
diff --git a/chrome/browser/profiles/profile_manager_browsertest.cc b/chrome/browser/profiles/profile_manager_browsertest.cc
index 6580f28..a5293ad 100644
--- a/chrome/browser/profiles/profile_manager_browsertest.cc
+++ b/chrome/browser/profiles/profile_manager_browsertest.cc
@@ -44,7 +44,7 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, DeleteSingletonProfile) {
   profile_manager->ScheduleProfileForDeletion(singleton_profile_path);
 
   // Spin things till profile is actually deleted.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   // Make sure a new profile was created automatically.
   EXPECT_EQ(cache.GetNumberOfProfiles(), 1U);
@@ -91,7 +91,7 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, MAYBE_DeleteAllProfiles) {
   profile_manager->ScheduleProfileForDeletion(profile_path2);
 
   // Spin things so deletion can take place.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   // Make sure a new profile was created automatically.
   EXPECT_EQ(cache.GetNumberOfProfiles(), 1U);
diff --git a/chrome/browser/protector/protector_service_browsertest.cc b/chrome/browser/protector/protector_service_browsertest.cc
index ebf95a6..0b01cdd 100644
--- a/chrome/browser/protector/protector_service_browsertest.cc
+++ b/chrome/browser/protector/protector_service_browsertest.cc
@@ -73,7 +73,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ChangeInitError) {
       WillOnce(Return(false));
   protector_service_->ShowChange(mock_change_);
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
   EXPECT_FALSE(protector_service_->GetLastChange());
 }
@@ -83,11 +83,11 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowAndDismiss) {
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(true));
   protector_service_->ShowChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
   EXPECT_EQ(mock_change_, protector_service_->GetLastChange());
   protector_service_->DismissChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
   EXPECT_FALSE(protector_service_->GetLastChange());
 }
@@ -97,11 +97,11 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowAndApply) {
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(true));
   protector_service_->ShowChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
   EXPECT_CALL(*mock_change_, Apply(browser()));
   protector_service_->ApplyChange(mock_change_, browser());
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
 }
 
@@ -118,7 +118,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, MAYBE_ShowAndApplyManually) {
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(true));
   protector_service_->ShowChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
   EXPECT_CALL(*mock_change_, Apply(browser()));
   // Pressing Cancel applies the change.
@@ -126,7 +126,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, MAYBE_ShowAndApplyManually) {
   ASSERT_TRUE(error);
   error->BubbleViewCancelButtonPressed(browser());
   error->GetBubbleView()->CloseBubbleView();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
 }
 
@@ -135,11 +135,11 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowAndDiscard) {
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(true));
   protector_service_->ShowChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
   EXPECT_CALL(*mock_change_, Discard(browser()));
   protector_service_->DiscardChange(mock_change_, browser());
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
 }
 
@@ -148,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowAndDiscardManually) {
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(true));
   protector_service_->ShowChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
   EXPECT_CALL(*mock_change_, Discard(browser()));
   // Pressing Apply discards the change.
@@ -156,7 +156,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowAndDiscardManually) {
   ASSERT_TRUE(error);
   error->BubbleViewAcceptButtonPressed(browser());
   error->GetBubbleView()->CloseBubbleView();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
 }
 
@@ -164,7 +164,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, BubbleClosedInsideApply) {
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(true));
   protector_service_->ShowChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
 
   GlobalError* error = GetGlobalError(mock_change_);
@@ -175,7 +175,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, BubbleClosedInsideApply) {
       bubble_view, &GlobalErrorBubbleViewBase::CloseBubbleView));
   // Pressing Cancel applies the change.
   error->BubbleViewCancelButtonPressed(browser());
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
 }
 
@@ -184,7 +184,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowMultipleChangesAndApply) {
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(true));
   protector_service_->ShowChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
   EXPECT_EQ(mock_change_, protector_service_->GetLastChange());
 
@@ -195,7 +195,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowMultipleChangesAndApply) {
       WillOnce(Return(true));
   EXPECT_CALL(*mock_change2, CanBeMerged()).WillRepeatedly(Return(false));
   protector_service_->ShowChange(mock_change2);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
   EXPECT_TRUE(IsGlobalErrorActive(mock_change2));
   EXPECT_EQ(mock_change2, protector_service_->GetLastChange());
@@ -203,7 +203,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowMultipleChangesAndApply) {
   // Apply the first change, the second should still be active.
   EXPECT_CALL(*mock_change_, Apply(browser()));
   protector_service_->ApplyChange(mock_change_, browser());
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
   EXPECT_TRUE(IsGlobalErrorActive(mock_change2));
   EXPECT_EQ(mock_change2, protector_service_->GetLastChange());
@@ -211,7 +211,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowMultipleChangesAndApply) {
   // Finally apply the second change.
   EXPECT_CALL(*mock_change2, Apply(browser()));
   protector_service_->ApplyChange(mock_change2, browser());
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
   EXPECT_FALSE(IsGlobalErrorActive(mock_change2));
   EXPECT_FALSE(protector_service_->GetLastChange());
@@ -223,7 +223,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest,
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(true));
   protector_service_->ShowChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
 
   // ProtectService will own this change instance as well.
@@ -233,20 +233,20 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest,
       WillOnce(Return(true));
   EXPECT_CALL(*mock_change2, CanBeMerged()).WillRepeatedly(Return(false));
   protector_service_->ShowChange(mock_change2);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
   EXPECT_TRUE(IsGlobalErrorActive(mock_change2));
 
   // Dismiss the first change, the second should still be active.
   protector_service_->DismissChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
   EXPECT_TRUE(IsGlobalErrorActive(mock_change2));
 
   // Finally apply the second change.
   EXPECT_CALL(*mock_change2, Apply(browser()));
   protector_service_->ApplyChange(mock_change2, browser());
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
   EXPECT_FALSE(IsGlobalErrorActive(mock_change2));
 }
@@ -257,7 +257,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest,
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(true));
   protector_service_->ShowChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
 
   // The first bubble view has been displayed.
@@ -272,7 +272,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest,
       WillOnce(Return(true));
   EXPECT_CALL(*mock_change2, CanBeMerged()).WillRepeatedly(Return(false));
   protector_service_->ShowChange(mock_change2);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
   EXPECT_TRUE(IsGlobalErrorActive(mock_change2));
 
@@ -287,7 +287,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest,
   EXPECT_CALL(*mock_change_, Apply(browser()));
   error->BubbleViewCancelButtonPressed(browser());
   error->GetBubbleView()->CloseBubbleView();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
   EXPECT_TRUE(IsGlobalErrorActive(mock_change2));
 
@@ -298,7 +298,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest,
   EXPECT_CALL(*mock_change2, Apply(browser()));
   error2->BubbleViewCancelButtonPressed(browser());
   error2->GetBubbleView()->CloseBubbleView();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
   EXPECT_FALSE(IsGlobalErrorActive(mock_change2));
 }
@@ -309,7 +309,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest,
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(true));
   protector_service_->ShowChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
 
   // The first bubble view has been displayed.
@@ -321,7 +321,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest,
   EXPECT_CALL(*mock_change_, Apply(browser()));
   error->BubbleViewCancelButtonPressed(browser());
   error->GetBubbleView()->CloseBubbleView();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
 
   // ProtectService will own this change instance as well.
@@ -331,7 +331,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest,
       WillOnce(Return(true));
   EXPECT_CALL(*mock_change2, CanBeMerged()).WillRepeatedly(Return(false));
   protector_service_->ShowChange(mock_change2);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change2));
 
   // The second bubble view has been displayed.
@@ -343,7 +343,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest,
   EXPECT_CALL(*mock_change2, Apply(browser()));
   error2->BubbleViewCancelButtonPressed(browser());
   error2->GetBubbleView()->CloseBubbleView();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change2));
 }
 
@@ -357,7 +357,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowMultipleDifferentURLs) {
   EXPECT_CALL(*mock_change_, GetNewSettingURL()).WillRepeatedly(Return(url1));
   EXPECT_CALL(*mock_change_, CanBeMerged()).WillRepeatedly(Return(true));
   protector_service_->ShowChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
   EXPECT_EQ(mock_change_, protector_service_->GetLastChange());
 
@@ -369,7 +369,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowMultipleDifferentURLs) {
   EXPECT_CALL(*mock_change2, GetNewSettingURL()).WillRepeatedly(Return(url2));
   EXPECT_CALL(*mock_change2, CanBeMerged()).WillRepeatedly(Return(true));
   protector_service_->ShowChange(mock_change2);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   // Both changes are shown separately, not composited.
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
@@ -378,7 +378,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowMultipleDifferentURLs) {
 
   protector_service_->DismissChange(mock_change_);
   protector_service_->DismissChange(mock_change2);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(protector_service_->GetLastChange());
 }
 
@@ -391,7 +391,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowCompositeAndDismiss) {
   EXPECT_CALL(*mock_change_, GetNewSettingURL()).WillRepeatedly(Return(url1));
   EXPECT_CALL(*mock_change_, CanBeMerged()).WillRepeatedly(Return(true));
   protector_service_->ShowChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
   EXPECT_EQ(mock_change_, protector_service_->GetLastChange());
 
@@ -408,7 +408,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowCompositeAndDismiss) {
   EXPECT_CALL(*mock_change2, GetNewSettingURL()).WillRepeatedly(Return(url1));
   EXPECT_CALL(*mock_change2, CanBeMerged()).WillRepeatedly(Return(true));
   protector_service_->ShowChange(mock_change2);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   // Now ProtectorService should be showing a single composite change.
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
@@ -424,7 +424,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowCompositeAndDismiss) {
   EXPECT_TRUE(error2->HasShownBubbleView());
 
   protector_service_->DismissChange(composite_change);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(composite_change));
   EXPECT_FALSE(protector_service_->GetLastChange());
 
@@ -435,14 +435,14 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowCompositeAndDismiss) {
   EXPECT_CALL(*mock_change3, GetNewSettingURL()).WillRepeatedly(Return(url1));
   EXPECT_CALL(*mock_change3, CanBeMerged()).WillRepeatedly(Return(true));
   protector_service_->ShowChange(mock_change3);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   // The third change should not be composed with the previous.
   EXPECT_TRUE(IsGlobalErrorActive(mock_change3));
   EXPECT_EQ(mock_change3, protector_service_->GetLastChange());
 
   protector_service_->DismissChange(mock_change3);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change3));
   EXPECT_FALSE(protector_service_->GetLastChange());
 }
@@ -457,7 +457,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowCompositeAndOther) {
   EXPECT_CALL(*mock_change_, GetNewSettingURL()).WillRepeatedly(Return(url1));
   EXPECT_CALL(*mock_change_, CanBeMerged()).WillRepeatedly(Return(true));
   protector_service_->ShowChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
   EXPECT_EQ(mock_change_, protector_service_->GetLastChange());
 
@@ -469,7 +469,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowCompositeAndOther) {
   EXPECT_CALL(*mock_change2, GetNewSettingURL()).WillRepeatedly(Return(url1));
   EXPECT_CALL(*mock_change2, CanBeMerged()).WillRepeatedly(Return(true));
   protector_service_->ShowChange(mock_change2);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   // Now ProtectorService should be showing a single composite change.
   BaseSettingChange* composite_change = protector_service_->GetLastChange();
@@ -483,7 +483,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowCompositeAndOther) {
   EXPECT_CALL(*mock_change3, GetNewSettingURL()).WillRepeatedly(Return(url1));
   EXPECT_CALL(*mock_change3, CanBeMerged()).WillRepeatedly(Return(true));
   protector_service_->ShowChange(mock_change3);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   // The third change should be composed with the previous.
   EXPECT_FALSE(IsGlobalErrorActive(mock_change3));
@@ -497,7 +497,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowCompositeAndOther) {
   EXPECT_CALL(*mock_change4, GetNewSettingURL()).WillRepeatedly(Return(url2));
   EXPECT_CALL(*mock_change4, CanBeMerged()).WillRepeatedly(Return(true));
   protector_service_->ShowChange(mock_change4);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   // The 4th change is shown independently.
   EXPECT_TRUE(IsGlobalErrorActive(composite_change));
@@ -506,7 +506,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowCompositeAndOther) {
 
   protector_service_->DismissChange(composite_change);
   protector_service_->DismissChange(mock_change4);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(composite_change));
   EXPECT_FALSE(IsGlobalErrorActive(mock_change4));
   EXPECT_FALSE(protector_service_->GetLastChange());
@@ -522,7 +522,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowCompositeAndDismissSingle) {
   EXPECT_CALL(*mock_change_, GetNewSettingURL()).WillRepeatedly(Return(url1));
   EXPECT_CALL(*mock_change_, CanBeMerged()).WillRepeatedly(Return(true));
   protector_service_->ShowChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
   EXPECT_EQ(mock_change_, protector_service_->GetLastChange());
 
@@ -534,7 +534,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowCompositeAndDismissSingle) {
   EXPECT_CALL(*mock_change2, GetNewSettingURL()).WillRepeatedly(Return(url1));
   EXPECT_CALL(*mock_change2, CanBeMerged()).WillRepeatedly(Return(true));
   protector_service_->ShowChange(mock_change2);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   // Now ProtectorService should be showing a single composite change.
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
@@ -551,7 +551,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowCompositeAndDismissSingle) {
   EXPECT_CALL(*mock_change3, GetNewSettingURL()).WillRepeatedly(Return(url2));
   EXPECT_CALL(*mock_change3, CanBeMerged()).WillRepeatedly(Return(true));
   protector_service_->ShowChange(mock_change3);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   // The third change should not be composed with the previous.
   EXPECT_TRUE(IsGlobalErrorActive(mock_change3));
@@ -560,7 +560,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowCompositeAndDismissSingle) {
 
   // Now dismiss the first change.
   protector_service_->DismissChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   // This should effectively dismiss the whole composite change.
   EXPECT_FALSE(IsGlobalErrorActive(composite_change));
@@ -568,7 +568,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowCompositeAndDismissSingle) {
   EXPECT_EQ(mock_change3, protector_service_->GetLastChange());
 
   protector_service_->DismissChange(mock_change3);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(mock_change3));
   EXPECT_FALSE(protector_service_->GetLastChange());
 }
@@ -584,7 +584,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, SameDomainDifferentURLs) {
   EXPECT_CALL(*mock_change_, GetNewSettingURL()).WillRepeatedly(Return(url1));
   EXPECT_CALL(*mock_change_, CanBeMerged()).WillRepeatedly(Return(true));
   protector_service_->ShowChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
   EXPECT_EQ(mock_change_, protector_service_->GetLastChange());
 
@@ -596,7 +596,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, SameDomainDifferentURLs) {
   EXPECT_CALL(*mock_change2, GetNewSettingURL()).WillRepeatedly(Return(url2));
   EXPECT_CALL(*mock_change2, CanBeMerged()).WillRepeatedly(Return(true));
   protector_service_->ShowChange(mock_change2);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   // Changes should be merged.
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
@@ -607,7 +607,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, SameDomainDifferentURLs) {
   EXPECT_TRUE(IsGlobalErrorActive(composite_change));
 
   protector_service_->DismissChange(composite_change);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(composite_change));
   EXPECT_FALSE(protector_service_->GetLastChange());
 }
@@ -623,7 +623,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, DifferentGoogleDomains) {
   EXPECT_CALL(*mock_change_, GetNewSettingURL()).WillRepeatedly(Return(url1));
   EXPECT_CALL(*mock_change_, CanBeMerged()).WillRepeatedly(Return(true));
   protector_service_->ShowChange(mock_change_);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
   EXPECT_EQ(mock_change_, protector_service_->GetLastChange());
 
@@ -635,7 +635,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, DifferentGoogleDomains) {
   EXPECT_CALL(*mock_change2, GetNewSettingURL()).WillRepeatedly(Return(url2));
   EXPECT_CALL(*mock_change2, CanBeMerged()).WillRepeatedly(Return(true));
   protector_service_->ShowChange(mock_change2);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   // Changes should be merged.
   EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
@@ -646,7 +646,7 @@ IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, DifferentGoogleDomains) {
   EXPECT_TRUE(IsGlobalErrorActive(composite_change));
 
   protector_service_->DismissChange(composite_change);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsGlobalErrorActive(composite_change));
   EXPECT_FALSE(protector_service_->GetLastChange());
 }
diff --git a/chrome/browser/sync/test/integration/sessions_helper.cc b/chrome/browser/sync/test/integration/sessions_helper.cc
index 32221f4..ed41974 100644
--- a/chrome/browser/sync/test/integration/sessions_helper.cc
+++ b/chrome/browser/sync/test/integration/sessions_helper.cc
@@ -58,7 +58,7 @@ bool GetLocalSession(int index, const browser_sync::SyncedSession** session) {
 }
 
 bool ModelAssociatorHasTabWithUrl(int index, const GURL& url) {
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   const browser_sync::SyncedSession* local_session;
   if (!GetLocalSession(index, &local_session)) {
     return false;
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index b0dd000..7bc6ab8 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -345,7 +345,7 @@ bool SyncTest::SetupSync() {
 void SyncTest::CleanUpOnMainThread() {
   // Close all browser windows.
   browser::CloseAllBrowsers();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   // All browsers should be closed at this point, or else we could see memory
   // corruption in QuitBrowser().
diff --git a/chrome/browser/ui/browser_close_browsertest.cc b/chrome/browser/ui/browser_close_browsertest.cc
index cc080ba..7002a3f 100644
--- a/chrome/browser/ui/browser_close_browsertest.cc
+++ b/chrome/browser/ui/browser_close_browsertest.cc
@@ -323,7 +323,7 @@ class BrowserCloseTest : public InProcessBrowserTest {
       if (!result)
         return false;
     }
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
 
     // All that work, for this one little test.
     EXPECT_TRUE((check_case.window_to_probe ==
@@ -365,7 +365,7 @@ class BrowserCloseTest : public InProcessBrowserTest {
         (*bit)->window()->Close();
       }
     }
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
 
     return true;
   }
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
index c1db603..23a0559 100644
--- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -1219,7 +1219,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_FitWindow) {
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
                        FindMovesOnTabClose_Issue1343052) {
   EnsureFindBoxOpen();
-  ui_test_utils::RunAllPendingInMessageLoop();  // Needed on Linux.
+  content::RunAllPendingInMessageLoop();  // Needed on Linux.
 
   gfx::Point position;
   EXPECT_TRUE(GetFindBarWindowInfo(&position, NULL));
@@ -1249,7 +1249,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   EnsureFindBoxOpen();
-  ui_test_utils::RunAllPendingInMessageLoop();  // Needed on Linux.
+  content::RunAllPendingInMessageLoop();  // Needed on Linux.
   EXPECT_TRUE(GetFindBarWindowInfo(&position, NULL));
 
   ui_test_utils::NavigateToURLWithDisposition(
diff --git a/chrome/browser/ui/global_error/global_error_service_browsertest.cc b/chrome/browser/ui/global_error/global_error_service_browsertest.cc
index 266c1b2..4cfe6f8 100644
--- a/chrome/browser/ui/global_error/global_error_service_browsertest.cc
+++ b/chrome/browser/ui/global_error/global_error_service_browsertest.cc
@@ -116,7 +116,7 @@ IN_PROC_BROWSER_TEST_F(GlobalErrorServiceBrowserTest, CloseBubbleView) {
   // Explicitly close the bubble view.
   EXPECT_TRUE(error->GetBubbleView());
   error->GetBubbleView()->CloseBubbleView();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_EQ(1, error->bubble_view_close_count());
 }
 
@@ -137,14 +137,14 @@ IN_PROC_BROWSER_TEST_F(GlobalErrorServiceBrowserTest,
 
   EXPECT_EQ(error.get(), service->GetFirstGlobalErrorWithBubbleView());
   error->ShowBubbleView(browser());
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(error->HasShownBubbleView());
   EXPECT_EQ(0, error->bubble_view_close_count());
 
   // Removing |error| from profile should dismiss the bubble view without
   // calling |error->BubbleViewDidClose|.
   service->RemoveGlobalError(error.get());
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_EQ(1, error->bubble_view_close_count());
   // |error| is no longer owned by service and will be deleted.
 }
diff --git a/chrome/browser/ui/login/login_prompt_browsertest.cc b/chrome/browser/ui/login/login_prompt_browsertest.cc
index 8f59d83..84b76bb 100644
--- a/chrome/browser/ui/login/login_prompt_browsertest.cc
+++ b/chrome/browser/ui/login/login_prompt_browsertest.cc
@@ -997,7 +997,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,
     // nothing".  Run anything pending in the message loop just to be sure.
     // (This shouldn't be necessary since notifications are synchronous, but
     // maybe it will help avoid flake someday in the future..)
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
   }
 
   EXPECT_EQ(1, observer.auth_needed_count_);
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 4263f24..c3cd9ac 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -341,7 +341,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
       // something important.  Since we don't know where in the observer list we
       // stand, just spin the message loop once more to allow the current
       // callstack to complete.
-      ui_test_utils::RunAllPendingInMessageLoop();
+      content::RunAllPendingInMessageLoop();
     }
   }
 
diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
index 8ce10bc..192fc44 100644
--- a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
+++ b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
@@ -43,11 +43,11 @@ void TabModalConfirmDialogTest::SetUpOnMainThread() {
       chrome::GetActiveWebContents(browser()));
   dialog_ = CreateTestDialog(delegate_,
                              chrome::GetActiveTabContents(browser()));
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 }
 
 void TabModalConfirmDialogTest::CleanUpOnMainThread() {
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ::testing::Mock::VerifyAndClearExpectations(delegate_);
 }
 
diff --git a/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc b/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc
index a03d585..d956b9f 100644
--- a/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc
+++ b/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc
@@ -114,7 +114,7 @@ class LauncherFaviconLoaderBrowsertest : public InProcessBrowserTest {
     base::Time start_time = base::Time::Now();
     while (!contents_observer_->got_favicons() ||
            contents_observer_->downloads_received() < expected) {
-      ui_test_utils::RunAllPendingInMessageLoop();
+      content::RunAllPendingInMessageLoop();
       base::TimeDelta delta = base::Time::Now() - start_time;
       if (delta.InSeconds() >= max_seconds) {
         LOG(ERROR) << " WaitForFaviconDownlads timed out:"
diff --git a/chrome/browser/ui/views/constrained_window_views_browsertest.cc b/chrome/browser/ui/views/constrained_window_views_browsertest.cc
index 38d3dba..a4c2f51 100644
--- a/chrome/browser/ui/views/constrained_window_views_browsertest.cc
+++ b/chrome/browser/ui/views/constrained_window_views_browsertest.cc
@@ -142,7 +142,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) {
   // test_dialog1.
   EXPECT_TRUE(focus_manager->ProcessAccelerator(
       ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE)));
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   EXPECT_TRUE(test_dialog1->done());
   EXPECT_FALSE(test_dialog2->done());
@@ -170,7 +170,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) {
   // Send another VKEY_RETURN, closing test_dialog2
   EXPECT_TRUE(focus_manager->ProcessAccelerator(
       ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE)));
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(test_dialog2->done());
   EXPECT_EQ(0u, constrained_window_helper->constrained_window_count());
 }
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 40aa3cc..4c83b53 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
@@ -24,7 +24,7 @@ class OneClickSigninBubbleViewBrowserTest : public InProcessBrowserTest {
     browser()->window()->ShowOneClickSigninBubble(
         base::Bind(&OneClickSigninBubbleViewBrowserTest::OnStartSync, this));
 
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
     EXPECT_TRUE(OneClickSigninBubbleView::IsShowing());
 
     OneClickSigninBubbleView* view =
@@ -52,11 +52,11 @@ class OneClickSigninBubbleViewBrowserTest : public InProcessBrowserTest {
 // Disabled. See http://crbug.com/132348
 IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewBrowserTest, DISABLED_Show) {
   ShowOneClickSigninBubble();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(OneClickSigninBubbleView::IsShowing());
 
   OneClickSigninBubbleView::Hide();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(on_start_sync_called_);
   EXPECT_EQ(OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS, mode_);
   EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());