chromeos: Fix screen locker tests.

chrome/browser/chromeos/login/screen_locker_browsertest.cc

 // Copyright (c) 2010 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/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 14 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/window/window_gtk.h"
 
 namespace {
 
 // An object that wait for lock state and fullscreen state.
 class Waiter : public NotificationObserver {
  public:
   explicit Waiter(Browser* browser)
-      : browser_(browser) {
+      : browser_(browser),
+        running_(false) {
     registrar_.Add(this,
                    NotificationType::SCREEN_LOCK_STATE_CHANGED,
                    NotificationService::AllSources());
     handler_id_ = g_signal_connect(
         G_OBJECT(browser_->window()->GetNativeHandle()),
         "window-state-event",
         G_CALLBACK(OnWindowStateEventThunk),
         this);
   }
 
   ~Waiter() {
     g_signal_handler_disconnect(
         G_OBJECT(browser_->window()->GetNativeHandle()),
         handler_id_);
   }
 
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     DCHECK(type == NotificationType::SCREEN_LOCK_STATE_CHANGED);
-    MessageLoop::current()->Quit();
+    if (running_)
+      MessageLoop::current()->Quit();
   }
 
   // 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) {
       ui_test_utils::RunMessageLoop();
     }
     // Make sure all pending tasks are executed.
     ui_test_utils::RunAllPendingInMessageLoop();
+    running_ = false;
   }
 
   CHROMEGTK_CALLBACK_1(Waiter, gboolean, OnWindowStateEvent,
                        GdkEventWindowState*);
 
  private:
   Browser* browser_;
   gulong handler_id_;
   NotificationRegistrar registrar_;
 
+  // Are we currently running the message loop?
+  bool running_;
+
   DISALLOW_COPY_AND_ASSIGN(Waiter);
 };
 
 gboolean Waiter::OnWindowStateEvent(GtkWidget* widget,
                                     GdkEventWindowState* event) {
   MessageLoop::current()->Quit();
   return false;
 }
 
 }  // namespace
@@ skipping 16 matching lines @@
     EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenUnlockRequested())
         .Times(1)
         .RetiresOnSaturation();
     EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenLockCompleted())
         .Times(1)
         .RetiresOnSaturation();
     UserManager::Get()->OffTheRecordUserLoggedIn();
     ScreenLocker::Show();
     scoped_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
     tester->EmulateWindowManagerReady();
-    ui_test_utils::WaitForNotification(
-        NotificationType::SCREEN_LOCK_STATE_CHANGED);
+    if (!chromeos::ScreenLocker::GetTester()->IsLocked())
+      ui_test_utils::WaitForNotification(
+          NotificationType::SCREEN_LOCK_STATE_CHANGED);
     EXPECT_TRUE(tester->IsLocked());
     tester->InjectMockAuthenticator("", "");
 
     unlock(tester->GetWidget());
 
     ui_test_utils::RunAllPendingInMessageLoop();
     EXPECT_TRUE(tester->IsLocked());
 
     // Emulate LockScreen request from PowerManager (via SessionManager).
     ScreenLocker::Hide();
@@ skipping 35 matching lines @@
   EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenUnlockRequested())
       .Times(1)
       .RetiresOnSaturation();
   EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenLockCompleted())
       .Times(1)
       .RetiresOnSaturation();
   UserManager::Get()->UserLoggedIn("user");
   ScreenLocker::Show();
   scoped_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
   tester->EmulateWindowManagerReady();
-  ui_test_utils::WaitForNotification(
-      NotificationType::SCREEN_LOCK_STATE_CHANGED);
+  if (!chromeos::ScreenLocker::GetTester()->IsLocked())
+    ui_test_utils::WaitForNotification(
+        NotificationType::SCREEN_LOCK_STATE_CHANGED);
 
   // 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()->GetBounds(&lock_bounds, true);
   EXPECT_GT(lock_bounds.width(), 10);
   EXPECT_GT(lock_bounds.height(), 10);
 
   tester->InjectMockAuthenticator("user", "pass");
@@ skipping 72 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestShowTwice) {
   EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenLockCompleted())
       .Times(2)
       .RetiresOnSaturation();
 
   UserManager::Get()->UserLoggedIn("user");
   ScreenLocker::Show();
   scoped_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
   tester->EmulateWindowManagerReady();
-  ui_test_utils::WaitForNotification(
-      NotificationType::SCREEN_LOCK_STATE_CHANGED);
+  if (!chromeos::ScreenLocker::GetTester()->IsLocked())
+    ui_test_utils::WaitForNotification(
+        NotificationType::SCREEN_LOCK_STATE_CHANGED);
   EXPECT_TRUE(tester->IsLocked());
 
   // 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();
   EXPECT_FALSE(tester->IsLocked());
 }
 
 }  // namespace chromeos