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

10 files changed, 13 insertions, 23 deletions

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_;