| Index: chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
|
| diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc b/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
|
| index f3311688a822350684c515944c308e87b6dbe33a..f438bd65c068b14cb251d0c653fb52072edcded4 100644
|
| --- a/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
|
| +++ b/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
|
| @@ -244,20 +244,17 @@ TEST_F(SessionStateDelegateChromeOSTest,
|
| TEST_F(SessionStateDelegateChromeOSTest,
|
| AddUserToMultiprofileDisallowedByMaximumUsers) {
|
| InitForMultiProfile();
|
| - ash::SessionStateDelegate::AddUserError add_user_error;
|
|
|
| - EXPECT_TRUE(
|
| - session_state_delegate()->CanAddUserToMultiProfile(&add_user_error));
|
| + EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED,
|
| + session_state_delegate()->GetAddUserSessionPolicy());
|
| const AccountId account_id(AccountId::FromUserEmail(kUser));
|
| user_manager()->LoginUser(account_id);
|
| while (session_state_delegate()->NumberOfLoggedInUsers() <
|
| session_state_delegate()->GetMaximumNumberOfLoggedInUsers()) {
|
| UserAddedToSession("bb@b.b");
|
| }
|
| - EXPECT_FALSE(
|
| - session_state_delegate()->CanAddUserToMultiProfile(&add_user_error));
|
| - EXPECT_EQ(ash::SessionStateDelegate::ADD_USER_ERROR_MAXIMUM_USERS_REACHED,
|
| - add_user_error);
|
| + EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_MAXIMUM_USERS_REACHED,
|
| + session_state_delegate()->GetAddUserSessionPolicy());
|
| }
|
|
|
| // Make sure adding users to multiprofiles disabled by logging in all possible
|
| @@ -265,37 +262,31 @@ TEST_F(SessionStateDelegateChromeOSTest,
|
| TEST_F(SessionStateDelegateChromeOSTest,
|
| AddUserToMultiprofileDisallowedByAllUsersLogged) {
|
| InitForMultiProfile();
|
| - ash::SessionStateDelegate::AddUserError add_user_error;
|
|
|
| - EXPECT_TRUE(
|
| - session_state_delegate()->CanAddUserToMultiProfile(&add_user_error));
|
| + EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED,
|
| + session_state_delegate()->GetAddUserSessionPolicy());
|
| const AccountId account_id(AccountId::FromUserEmail(kUser));
|
| user_manager()->LoginUser(account_id);
|
| UserAddedToSession("bb@b.b");
|
| - EXPECT_FALSE(
|
| - session_state_delegate()->CanAddUserToMultiProfile(&add_user_error));
|
| - EXPECT_EQ(ash::SessionStateDelegate::ADD_USER_ERROR_OUT_OF_USERS,
|
| - add_user_error);
|
| + EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_NO_ELIGIBLE_USERS,
|
| + session_state_delegate()->GetAddUserSessionPolicy());
|
| }
|
|
|
| // Make sure adding users to multiprofiles disabled by primary user policy.
|
| TEST_F(SessionStateDelegateChromeOSTest,
|
| AddUserToMultiprofileDisallowedByPrimaryUserPolicy) {
|
| InitForMultiProfile();
|
| - ash::SessionStateDelegate::AddUserError add_user_error;
|
|
|
| - EXPECT_TRUE(
|
| - session_state_delegate()->CanAddUserToMultiProfile(&add_user_error));
|
| + EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED,
|
| + session_state_delegate()->GetAddUserSessionPolicy());
|
| const AccountId account_id(AccountId::FromUserEmail(kUser));
|
| user_manager()->LoginUser(account_id);
|
| user_profile_->GetPrefs()->SetString(
|
| prefs::kMultiProfileUserBehavior,
|
| chromeos::MultiProfileUserController::kBehaviorNotAllowed);
|
| user_manager()->AddUser(AccountId::FromUserEmail("bb@b.b"));
|
| - EXPECT_FALSE(
|
| - session_state_delegate()->CanAddUserToMultiProfile(&add_user_error));
|
| - EXPECT_EQ(ash::SessionStateDelegate::ADD_USER_ERROR_NOT_ALLOWED_PRIMARY_USER,
|
| - add_user_error);
|
| + EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_NOT_ALLOWED_PRIMARY_USER,
|
| + session_state_delegate()->GetAddUserSessionPolicy());
|
| }
|
|
|
| } // namespace chromeos
|
|
|