Move RunAllPendingInMessageLoop from ui_test_utils.h to test_utils.h, so that it can be reused by c…

chrome/browser/chromeos/login/screen_locker_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
 #include "chrome/browser/chromeos/login/mock_authenticator.h"
@@ skipping 46 matching lines @@
   // Wait until the two conditions are met.
   void Wait(bool locker_state, bool fullscreen) {
     running_ = true;
     scoped_ptr<chromeos::test::ScreenLockerTester>
         tester(chromeos::ScreenLocker::GetTester());
     while (tester->IsLocked() != locker_state ||
            browser_->window()->IsFullscreen() != fullscreen) {
       content::RunMessageLoop();
     }
     // Make sure all pending tasks are executed.
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
     running_ = false;
   }
 
  private:
   Browser* browser_;
   content::NotificationRegistrar registrar_;
 
   // Are we currently running the message loop?
   bool running_;
 
@@ skipping 70 matching lines @@
   // Test to make sure that the widget is actually appearing and is of
   // reasonable size, preventing a regression of
   // http://code.google.com/p/chromium-os/issues/detail?id=5987
   gfx::Rect lock_bounds = tester->GetChildWidget()->GetWindowBoundsInScreen();
   EXPECT_GT(lock_bounds.width(), 10);
   EXPECT_GT(lock_bounds.height(), 10);
 
   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());
 }
 
 IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestFullscreenExit) {
   EXPECT_CALL(*mock_power_manager_client_, NotifyScreenLockCompleted())
       .Times(1)
       .RetiresOnSaturation();
   scoped_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
   {
     Waiter waiter(browser());
     browser()->fullscreen_controller()->ToggleFullscreenMode();
     waiter.Wait(false /* not locked */, true /* full screen */);
     EXPECT_TRUE(browser()->window()->IsFullscreen());
     EXPECT_FALSE(tester->IsLocked());
   }
   {
     Waiter waiter(browser());
     ScreenLocker::Show();
     tester->EmulateWindowManagerReady();
     waiter.Wait(true /* locked */, false /* full screen */);
     EXPECT_FALSE(browser()->window()->IsFullscreen());
     EXPECT_TRUE(tester->IsLocked());
   }
   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());
 }
 
 void SimulateKeyPress(views::Widget* widget, ui::KeyboardCode key_code) {
   ui_controls::SendKeyPress(widget->GetNativeWindow(),
                             key_code, false, false, false, false);
 }
 
 void UnlockKeyPress(views::Widget* widget) {
   SimulateKeyPress(widget, ui::VKEY_SPACE);
 }
 
 IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestShowTwice) {
   EXPECT_CALL(*mock_power_manager_client_, NotifyScreenLockCompleted())
       .Times(2)
       .RetiresOnSaturation();
   scoped_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
   LockScreen(tester.get());
 
   // Ensure there's a profile or this test crashes.
   ProfileManager::GetDefaultProfile();
 
   // Calling Show again simply send LockCompleted signal.
   ScreenLocker::Show();
   EXPECT_TRUE(tester->IsLocked());
 
   // Close the locker to match expectations.
   ScreenLocker::Hide();
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(tester->IsLocked());
 }
 
 // TODO(flackr): Find out why the RenderView isn't getting the escape press
 // and re-enable this test (currently this test is flaky).
 IN_PROC_BROWSER_TEST_F(ScreenLockerTest, DISABLED_TestEscape) {
   EXPECT_CALL(*mock_power_manager_client_, NotifyScreenLockCompleted())
       .Times(1)
       .RetiresOnSaturation();
   scoped_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
   LockScreen(tester.get());
 
   // Ensure there's a profile or this test crashes.
   ProfileManager::GetDefaultProfile();
 
   tester->SetPassword("password");
   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());
 }
 
 }  // namespace chromeos