OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/login/screen_locker.h" | 5 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
6 | 6 |
7 #include "ash/wm/window_state.h" | 7 #include "ash/wm/window_state.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
11 #include "chrome/browser/chrome_notification_types.h" | 11 #include "chrome/browser/chrome_notification_types.h" |
12 #include "chrome/browser/chromeos/login/mock_authenticator.h" | 12 #include "chrome/browser/chromeos/login/auth/mock_authenticator.h" |
13 #include "chrome/browser/chromeos/login/screen_locker_tester.h" | 13 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h" |
14 #include "chrome/browser/chromeos/login/user_manager.h" | 14 #include "chrome/browser/chromeos/login/users/user_manager.h" |
15 #include "chrome/browser/profiles/profile_manager.h" | 15 #include "chrome/browser/profiles/profile_manager.h" |
16 #include "chrome/browser/ui/browser.h" | 16 #include "chrome/browser/ui/browser.h" |
17 #include "chrome/browser/ui/browser_window.h" | 17 #include "chrome/browser/ui/browser_window.h" |
18 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" | 18 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" |
19 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 19 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
20 #include "chrome/common/chrome_switches.h" | 20 #include "chrome/common/chrome_switches.h" |
21 #include "chrome/test/base/in_process_browser_test.h" | 21 #include "chrome/test/base/in_process_browser_test.h" |
22 #include "chrome/test/base/ui_test_utils.h" | 22 #include "chrome/test/base/ui_test_utils.h" |
23 #include "chromeos/chromeos_switches.h" | 23 #include "chromeos/chromeos_switches.h" |
24 #include "chromeos/dbus/fake_dbus_thread_manager.h" | 24 #include "chromeos/dbus/fake_dbus_thread_manager.h" |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
293 EXPECT_EQ("", tester->GetPassword()); | 293 EXPECT_EQ("", tester->GetPassword()); |
294 | 294 |
295 // Close the locker to match expectations. | 295 // Close the locker to match expectations. |
296 ScreenLocker::Hide(); | 296 ScreenLocker::Hide(); |
297 content::RunAllPendingInMessageLoop(); | 297 content::RunAllPendingInMessageLoop(); |
298 EXPECT_FALSE(tester->IsLocked()); | 298 EXPECT_FALSE(tester->IsLocked()); |
299 EXPECT_TRUE(VerifyLockScreenDismissed()); | 299 EXPECT_TRUE(VerifyLockScreenDismissed()); |
300 } | 300 } |
301 | 301 |
302 } // namespace chromeos | 302 } // namespace chromeos |
OLD | NEW |