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/kiosk_mode/kiosk_mode_idle_logout.h" | 5 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/test/ash_test_base.h" | 8 #include "ash/test/ash_test_base.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
12 #include "base/synchronization/waitable_event.h" | 12 #include "base/synchronization/waitable_event.h" |
13 #include "chrome/browser/chrome_notification_types.h" | 13 #include "chrome/browser/chrome_notification_types.h" |
14 #include "chrome/browser/chromeos/login/users/user_manager.h" | |
15 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h" | 14 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h" |
| 15 #include "components/user_manager/user_manager.h" |
16 #include "content/public/browser/notification_registrar.h" | 16 #include "content/public/browser/notification_registrar.h" |
17 #include "content/public/browser/notification_service.h" | 17 #include "content/public/browser/notification_service.h" |
18 #include "testing/gtest/include/gtest/gtest.h" | 18 #include "testing/gtest/include/gtest/gtest.h" |
19 #include "ui/wm/core/user_activity_detector.h" | 19 #include "ui/wm/core/user_activity_detector.h" |
20 | 20 |
21 namespace chromeos { | 21 namespace chromeos { |
22 | 22 |
23 class KioskModeIdleLogoutTest : public ash::test::AshTestBase { | 23 class KioskModeIdleLogoutTest : public ash::test::AshTestBase { |
24 public: | 24 public: |
25 KioskModeIdleLogoutTest() | 25 KioskModeIdleLogoutTest() |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 // http://crbug.com/177918 | 57 // http://crbug.com/177918 |
58 TEST_F(KioskModeIdleLogoutTest, DISABLED_CheckObserversBeforeUserLogin) { | 58 TEST_F(KioskModeIdleLogoutTest, DISABLED_CheckObserversBeforeUserLogin) { |
59 EXPECT_TRUE(LoginUserObserverRegistered()); | 59 EXPECT_TRUE(LoginUserObserverRegistered()); |
60 EXPECT_FALSE(UserActivityObserverRegistered()); | 60 EXPECT_FALSE(UserActivityObserverRegistered()); |
61 } | 61 } |
62 | 62 |
63 // http://crbug.com/177918 | 63 // http://crbug.com/177918 |
64 TEST_F(KioskModeIdleLogoutTest, DISABLED_CheckObserversAfterUserLogin) { | 64 TEST_F(KioskModeIdleLogoutTest, DISABLED_CheckObserversAfterUserLogin) { |
65 content::NotificationService::current()->Notify( | 65 content::NotificationService::current()->Notify( |
66 chrome::NOTIFICATION_LOGIN_USER_CHANGED, | 66 chrome::NOTIFICATION_LOGIN_USER_CHANGED, |
67 content::Source<UserManager>(UserManager::Get()), | 67 content::Source<user_manager::UserManager>( |
| 68 user_manager::UserManager::Get()), |
68 // Ideally this should be the user logged in, but since we won't really be | 69 // Ideally this should be the user logged in, but since we won't really be |
69 // checking for the current logged in user in our observer anyway, giving | 70 // checking for the current logged in user in our observer anyway, giving |
70 // NoDetails here is fine. | 71 // NoDetails here is fine. |
71 content::NotificationService::NoDetails()); | 72 content::NotificationService::NoDetails()); |
72 | 73 |
73 RunAllPendingInMessageLoop(); | 74 RunAllPendingInMessageLoop(); |
74 EXPECT_FALSE(LoginUserObserverRegistered()); | 75 EXPECT_FALSE(LoginUserObserverRegistered()); |
75 EXPECT_TRUE(UserActivityObserverRegistered()); | 76 EXPECT_TRUE(UserActivityObserverRegistered()); |
76 } | 77 } |
77 | 78 |
78 } // namespace chromeos | 79 } // namespace chromeos |
OLD | NEW |