| Index: chrome/browser/chromeos/login/screen_locker_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
|
| deleted file mode 100644
|
| index 594f7fc9719c1284fc190d06b3b5d7fe099f73d3..0000000000000000000000000000000000000000
|
| --- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc
|
| +++ /dev/null
|
| @@ -1,347 +0,0 @@
|
| -// 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/dbus/mock_dbus_thread_manager.h"
|
| -#include "chrome/browser/chromeos/dbus/mock_power_manager_client.h"
|
| -#include "chrome/browser/chromeos/login/mock_authenticator.h"
|
| -#include "chrome/browser/chromeos/login/screen_locker.h"
|
| -#include "chrome/browser/chromeos/login/screen_locker_tester.h"
|
| -#include "chrome/browser/chromeos/login/user_manager.h"
|
| -#include "chrome/browser/profiles/profile_manager.h"
|
| -#include "chrome/browser/ui/browser.h"
|
| -#include "chrome/browser/ui/browser_window.h"
|
| -#include "chrome/browser/ui/views/browser_dialogs.h"
|
| -#include "chrome/common/chrome_notification_types.h"
|
| -#include "chrome/common/chrome_switches.h"
|
| -#include "chrome/test/base/ui_test_utils.h"
|
| -#include "content/public/browser/notification_service.h"
|
| -#include "testing/gmock/include/gmock/gmock.h"
|
| -#include "testing/gtest/include/gtest/gtest.h"
|
| -#include "ui/ui_controls/ui_controls.h"
|
| -#include "ui/views/widget/widget.h"
|
| -
|
| -#if defined(TOOLKIT_USES_GTK)
|
| -#include "ui/views/widget/native_widget_gtk.h"
|
| -#endif
|
| -
|
| -namespace {
|
| -
|
| -// An object that wait for lock state and fullscreen state.
|
| -class Waiter : public content::NotificationObserver {
|
| - public:
|
| - explicit Waiter(Browser* browser)
|
| - : browser_(browser),
|
| - running_(false) {
|
| - registrar_.Add(this,
|
| - chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
|
| - content::NotificationService::AllSources());
|
| -#if defined(TOOLKIT_USES_GTK)
|
| - handler_id_ = g_signal_connect(
|
| - G_OBJECT(browser_->window()->GetNativeHandle()),
|
| - "window-state-event",
|
| - G_CALLBACK(OnWindowStateEventThunk),
|
| - this);
|
| -#else
|
| - registrar_.Add(this,
|
| - chrome::NOTIFICATION_FULLSCREEN_CHANGED,
|
| - content::NotificationService::AllSources());
|
| -#endif
|
| - }
|
| -
|
| - virtual ~Waiter() {
|
| -#if defined(TOOLKIT_USES_GTK)
|
| - g_signal_handler_disconnect(
|
| - G_OBJECT(browser_->window()->GetNativeHandle()),
|
| - handler_id_);
|
| -#endif
|
| - }
|
| -
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) {
|
| - DCHECK(type == chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED ||
|
| - type == chrome::NOTIFICATION_FULLSCREEN_CHANGED);
|
| - 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;
|
| - }
|
| -
|
| -#if defined(TOOLKIT_USES_GTK)
|
| - CHROMEGTK_CALLBACK_1(Waiter, gboolean, OnWindowStateEvent,
|
| - GdkEventWindowState*);
|
| -#endif
|
| -
|
| - private:
|
| - Browser* browser_;
|
| -#if defined(TOOLKIT_USES_GTK)
|
| - gulong handler_id_;
|
| -#endif
|
| - content::NotificationRegistrar registrar_;
|
| -
|
| - // Are we currently running the message loop?
|
| - bool running_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(Waiter);
|
| -};
|
| -
|
| -#if defined(TOOLKIT_USES_GTK)
|
| -gboolean Waiter::OnWindowStateEvent(GtkWidget* widget,
|
| - GdkEventWindowState* event) {
|
| - MessageLoop::current()->Quit();
|
| - return false;
|
| -}
|
| -#endif
|
| -
|
| -} // namespace
|
| -
|
| -namespace chromeos {
|
| -
|
| -class ScreenLockerTest : public CrosInProcessBrowserTest {
|
| - public:
|
| - ScreenLockerTest() : mock_power_manager_client_(NULL) {
|
| - }
|
| -
|
| - protected:
|
| - MockPowerManagerClient* mock_power_manager_client_;
|
| -
|
| - // Test the no password mode with different unlock scheme given by
|
| - // |unlock| function.
|
| - void TestNoPassword(void (unlock)(views::Widget*)) {
|
| - EXPECT_CALL(*mock_power_manager_client_, NotifyScreenUnlockRequested())
|
| - .Times(1)
|
| - .RetiresOnSaturation();
|
| - EXPECT_CALL(*mock_power_manager_client_, NotifyScreenLockCompleted())
|
| - .Times(1)
|
| - .RetiresOnSaturation();
|
| - UserManager::Get()->GuestUserLoggedIn();
|
| - ScreenLocker::Show();
|
| - scoped_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
|
| - tester->EmulateWindowManagerReady();
|
| - ui_test_utils::WindowedNotificationObserver lock_state_observer(
|
| - chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
|
| - content::NotificationService::AllSources());
|
| - if (!chromeos::ScreenLocker::GetTester()->IsLocked())
|
| - lock_state_observer.Wait();
|
| - 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();
|
| - ui_test_utils::RunAllPendingInMessageLoop();
|
| - EXPECT_FALSE(tester->IsLocked());
|
| - }
|
| -
|
| - void LockScreenWithUser(test::ScreenLockerTester* tester,
|
| - const std::string& user) {
|
| - UserManager::Get()->UserLoggedIn(user);
|
| - ScreenLocker::Show();
|
| - tester->EmulateWindowManagerReady();
|
| - ui_test_utils::WindowedNotificationObserver lock_state_observer(
|
| - chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
|
| - content::NotificationService::AllSources());
|
| - if (!tester->IsLocked())
|
| - lock_state_observer.Wait();
|
| - EXPECT_TRUE(tester->IsLocked());
|
| - }
|
| -
|
| - private:
|
| - virtual void SetUpInProcessBrowserTestFixture() {
|
| - MockDBusThreadManager* mock_dbus_thread_manager =
|
| - new MockDBusThreadManager;
|
| - DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);
|
| - mock_power_manager_client_ = static_cast<MockPowerManagerClient*>(
|
| - DBusThreadManager::Get()->GetPowerManagerClient());
|
| - cros_mock_->InitStatusAreaMocks();
|
| - EXPECT_CALL(*mock_power_manager_client_, AddObserver(testing::_))
|
| - .Times(1)
|
| - .RetiresOnSaturation();
|
| - EXPECT_CALL(*mock_power_manager_client_, NotifyScreenUnlockCompleted())
|
| - .Times(1)
|
| - .RetiresOnSaturation();
|
| - // Expectations for the status are on the screen lock window.
|
| - cros_mock_->SetStatusAreaMocksExpectations();
|
| - // Expectations for the status area on the browser window.
|
| - cros_mock_->SetStatusAreaMocksExpectations();
|
| - }
|
| -
|
| - virtual void SetUpCommandLine(CommandLine* command_line) {
|
| - command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
|
| - command_line->AppendSwitch(switches::kNoFirstRun);
|
| - }
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(ScreenLockerTest);
|
| -};
|
| -
|
| -// Temporarily disabling all screen locker tests while investigating the
|
| -// issue crbug.com/78764.
|
| -IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestBasic) {
|
| - EXPECT_CALL(*mock_power_manager_client_, NotifyScreenUnlockRequested())
|
| - .Times(1)
|
| - .RetiresOnSaturation();
|
| - EXPECT_CALL(*mock_power_manager_client_, NotifyScreenLockCompleted())
|
| - .Times(1)
|
| - .RetiresOnSaturation();
|
| - UserManager::Get()->UserLoggedIn("user");
|
| - ScreenLocker::Show();
|
| - scoped_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
|
| - tester->EmulateWindowManagerReady();
|
| - ui_test_utils::WindowedNotificationObserver lock_state_observer(
|
| - chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
|
| - content::NotificationService::AllSources());
|
| - if (!chromeos::ScreenLocker::GetTester()->IsLocked())
|
| - lock_state_observer.Wait();
|
| -
|
| - // 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()->GetWindowScreenBounds();
|
| - EXPECT_GT(lock_bounds.width(), 10);
|
| - EXPECT_GT(lock_bounds.height(), 10);
|
| -
|
| - tester->InjectMockAuthenticator("user", "pass");
|
| - EXPECT_TRUE(tester->IsLocked());
|
| - tester->EnterPassword("fail");
|
| - ui_test_utils::RunAllPendingInMessageLoop();
|
| - EXPECT_TRUE(tester->IsLocked());
|
| - tester->EnterPassword("pass");
|
| - ui_test_utils::RunAllPendingInMessageLoop();
|
| - // Successful authentication simply send a unlock request to PowerManager.
|
| - EXPECT_TRUE(tester->IsLocked());
|
| -
|
| - // Emulate LockScreen request from PowerManager (via SessionManager).
|
| - // TODO(oshima): Find out better way to handle this in mock.
|
| - ScreenLocker::Hide();
|
| - ui_test_utils::RunAllPendingInMessageLoop();
|
| - EXPECT_FALSE(tester->IsLocked());
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestFullscreenExit) {
|
| - EXPECT_CALL(*mock_power_manager_client_, NotifyScreenUnlockRequested())
|
| - .Times(1)
|
| - .RetiresOnSaturation();
|
| - EXPECT_CALL(*mock_power_manager_client_, NotifyScreenLockCompleted())
|
| - .Times(1)
|
| - .RetiresOnSaturation();
|
| - scoped_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
|
| - {
|
| - Waiter waiter(browser());
|
| - browser()->ToggleFullscreenMode();
|
| - waiter.Wait(false /* not locked */, true /* full screen */);
|
| - EXPECT_TRUE(browser()->window()->IsFullscreen());
|
| - EXPECT_FALSE(tester->IsLocked());
|
| - }
|
| - {
|
| - Waiter waiter(browser());
|
| - UserManager::Get()->UserLoggedIn("user");
|
| - ScreenLocker::Show();
|
| - tester->EmulateWindowManagerReady();
|
| - waiter.Wait(true /* locked */, false /* full screen */);
|
| - EXPECT_FALSE(browser()->window()->IsFullscreen());
|
| - EXPECT_TRUE(tester->IsLocked());
|
| - }
|
| - tester->InjectMockAuthenticator("user", "pass");
|
| - tester->EnterPassword("pass");
|
| - ui_test_utils::RunAllPendingInMessageLoop();
|
| - ScreenLocker::Hide();
|
| - ui_test_utils::RunAllPendingInMessageLoop();
|
| - EXPECT_FALSE(tester->IsLocked());
|
| -}
|
| -
|
| -void MouseMove(views::Widget* widget) {
|
| - ui_controls::SendMouseMove(10, 10);
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(ScreenLockerTest,
|
| - DISABLED_TestNoPasswordWithMouseMove) {
|
| - TestNoPassword(MouseMove);
|
| -}
|
| -
|
| -void MouseClick(views::Widget* widget) {
|
| - ui_controls::SendMouseClick(ui_controls::RIGHT);
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(ScreenLockerTest,
|
| - DISABLED_TestNoPasswordWithMouseClick) {
|
| - TestNoPassword(MouseClick);
|
| -}
|
| -
|
| -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, DISABLED_TestNoPasswordWithKeyPress) {
|
| - TestNoPassword(UnlockKeyPress);
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestShowTwice) {
|
| - EXPECT_CALL(*mock_power_manager_client_, NotifyScreenLockCompleted())
|
| - .Times(2)
|
| - .RetiresOnSaturation();
|
| - scoped_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
|
| - LockScreenWithUser(tester.get(), "user");
|
| -
|
| - // 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();
|
| - EXPECT_FALSE(tester->IsLocked());
|
| -}
|
| -
|
| -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());
|
| - LockScreenWithUser(tester.get(), "user");
|
| -
|
| - // 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();
|
| - EXPECT_EQ("", tester->GetPassword());
|
| -
|
| - // Close the locker to match expectations.
|
| - ScreenLocker::Hide();
|
| - ui_test_utils::RunAllPendingInMessageLoop();
|
| - EXPECT_FALSE(tester->IsLocked());
|
| -}
|
| -
|
| -} // namespace chromeos
|
|
|