| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ash/session/session_state_delegate.h" | 5 #include "ash/session/session_state_delegate.h" |
| 6 #include "ash/shell.h" | 6 #include "ash/shell.h" |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
| 9 #include "chrome/browser/chromeos/login/lock/screen_locker.h" | 9 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
| 10 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h" | 10 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h" |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 }; | 84 }; |
| 85 | 85 |
| 86 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, PRE_CancelAdding) { | 86 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, PRE_CancelAdding) { |
| 87 RegisterUser(kTestUsers[0]); | 87 RegisterUser(kTestUsers[0]); |
| 88 RegisterUser(kTestUsers[1]); | 88 RegisterUser(kTestUsers[1]); |
| 89 RegisterUser(kTestUsers[2]); | 89 RegisterUser(kTestUsers[2]); |
| 90 StartupUtils::MarkOobeCompleted(); | 90 StartupUtils::MarkOobeCompleted(); |
| 91 } | 91 } |
| 92 | 92 |
| 93 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, CancelAdding) { | 93 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, CancelAdding) { |
| 94 EXPECT_CALL(login_utils(), DoBrowserLaunch(_, _)).Times(1); | |
| 95 EXPECT_EQ(3u, user_manager::UserManager::Get()->GetUsers().size()); | 94 EXPECT_EQ(3u, user_manager::UserManager::Get()->GetUsers().size()); |
| 96 EXPECT_EQ(0u, user_manager::UserManager::Get()->GetLoggedInUsers().size()); | 95 EXPECT_EQ(0u, user_manager::UserManager::Get()->GetLoggedInUsers().size()); |
| 97 | 96 |
| 98 EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY, | 97 EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY, |
| 99 ash::Shell::GetInstance()->session_state_delegate()-> | 98 ash::Shell::GetInstance()->session_state_delegate()-> |
| 100 GetSessionState()); | 99 GetSessionState()); |
| 101 | 100 |
| 102 LoginUser(kTestUsers[0]); | 101 LoginUser(kTestUsers[0]); |
| 103 EXPECT_EQ(1u, user_manager::UserManager::Get()->GetLoggedInUsers().size()); | 102 EXPECT_EQ(1u, user_manager::UserManager::Get()->GetLoggedInUsers().size()); |
| 104 EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE, | 103 EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE, |
| (...skipping 24 matching lines...) Expand all Loading... |
| 129 RegisterUser(kTestUsers[0]); | 128 RegisterUser(kTestUsers[0]); |
| 130 RegisterUser(kTestUsers[1]); | 129 RegisterUser(kTestUsers[1]); |
| 131 RegisterUser(kTestUsers[2]); | 130 RegisterUser(kTestUsers[2]); |
| 132 StartupUtils::MarkOobeCompleted(); | 131 StartupUtils::MarkOobeCompleted(); |
| 133 } | 132 } |
| 134 | 133 |
| 135 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, AddingSeveralUsers) { | 134 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, AddingSeveralUsers) { |
| 136 EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY, | 135 EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY, |
| 137 ash::Shell::GetInstance()->session_state_delegate()-> | 136 ash::Shell::GetInstance()->session_state_delegate()-> |
| 138 GetSessionState()); | 137 GetSessionState()); |
| 139 EXPECT_CALL(login_utils(), DoBrowserLaunch(_, _)).Times(3); | |
| 140 LoginUser(kTestUsers[0]); | 138 LoginUser(kTestUsers[0]); |
| 141 EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE, | 139 EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE, |
| 142 ash::Shell::GetInstance()->session_state_delegate()-> | 140 ash::Shell::GetInstance()->session_state_delegate()-> |
| 143 GetSessionState()); | 141 GetSessionState()); |
| 144 | 142 |
| 145 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); | 143 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); |
| 146 | 144 |
| 147 for (int i = 1; i < 3; ++i) { | 145 for (int i = 1; i < 3; ++i) { |
| 148 UserAddingScreen::Get()->Start(); | 146 UserAddingScreen::Get()->Start(); |
| 149 content::RunAllPendingInMessageLoop(); | 147 content::RunAllPendingInMessageLoop(); |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 content::NotificationService::AllSources()).Wait(); | 262 content::NotificationService::AllSources()).Wait(); |
| 265 | 263 |
| 266 UserAddingScreen::Get()->Start(); | 264 UserAddingScreen::Get()->Start(); |
| 267 content::RunAllPendingInMessageLoop(); | 265 content::RunAllPendingInMessageLoop(); |
| 268 CheckScreenIsVisible(); | 266 CheckScreenIsVisible(); |
| 269 UserAddingScreen::Get()->Cancel(); | 267 UserAddingScreen::Get()->Cancel(); |
| 270 content::RunAllPendingInMessageLoop(); | 268 content::RunAllPendingInMessageLoop(); |
| 271 } | 269 } |
| 272 | 270 |
| 273 } // namespace chromeos | 271 } // namespace chromeos |
| OLD | NEW |