OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/ui/ash/session_state_delegate_chromeos.h" | 5 #include "chrome/browser/ui/ash/session_controller_client.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "base/run_loop.h" | 12 #include "base/run_loop.h" |
13 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" | 13 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" |
14 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" | 14 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" |
15 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" | 15 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" |
16 #include "chrome/browser/chromeos/policy/policy_cert_service.h" | 16 #include "chrome/browser/chromeos/policy/policy_cert_service.h" |
17 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" | 17 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" |
18 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h" | 18 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h" |
19 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 19 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
20 #include "chrome/common/pref_names.h" | 20 #include "chrome/common/pref_names.h" |
21 #include "chrome/test/base/testing_browser_process.h" | 21 #include "chrome/test/base/testing_browser_process.h" |
22 #include "chrome/test/base/testing_profile_manager.h" | 22 #include "chrome/test/base/testing_profile_manager.h" |
23 #include "components/signin/core/account_id/account_id.h" | 23 #include "components/signin/core/account_id/account_id.h" |
24 #include "components/user_manager/user_manager.h" | 24 #include "components/user_manager/user_manager.h" |
25 #include "content/public/test/test_browser_thread_bundle.h" | 25 #include "content/public/test/test_browser_thread_bundle.h" |
26 #include "net/cert/x509_certificate.h" | 26 #include "net/cert/x509_certificate.h" |
27 #include "net/test/cert_test_util.h" | 27 #include "net/test/cert_test_util.h" |
28 #include "net/test/test_data_directory.h" | 28 #include "net/test/test_data_directory.h" |
29 #include "testing/gtest/include/gtest/gtest.h" | 29 #include "testing/gtest/include/gtest/gtest.h" |
30 | 30 |
31 namespace chromeos { | 31 using chromeos::FakeChromeUserManager; |
32 | 32 |
33 namespace { | 33 namespace { |
34 | 34 |
35 const char* kUser = "user@test.com"; | 35 const char* kUser = "user@test.com"; |
36 | 36 |
37 // Weak ptr to PolicyCertVerifier - object is freed in test destructor once | 37 // Weak ptr to PolicyCertVerifier - object is freed in test destructor once |
38 // we've ensured the profile has been shut down. | 38 // we've ensured the profile has been shut down. |
39 policy::PolicyCertVerifier* g_policy_cert_verifier_for_factory = NULL; | 39 policy::PolicyCertVerifier* g_policy_cert_verifier_for_factory = nullptr; |
40 | 40 |
41 std::unique_ptr<KeyedService> CreateTestPolicyCertService( | 41 std::unique_ptr<KeyedService> CreateTestPolicyCertService( |
42 content::BrowserContext* context) { | 42 content::BrowserContext* context) { |
43 return policy::PolicyCertService::CreateForTesting( | 43 return policy::PolicyCertService::CreateForTesting( |
44 kUser, g_policy_cert_verifier_for_factory, | 44 kUser, g_policy_cert_verifier_for_factory, |
45 user_manager::UserManager::Get()); | 45 user_manager::UserManager::Get()); |
46 } | 46 } |
47 | 47 |
48 } // namespace | 48 } // namespace |
49 | 49 |
50 class SessionStateDelegateChromeOSTest : public testing::Test { | 50 class SessionControllerClientTest : public testing::Test { |
51 protected: | 51 protected: |
52 SessionStateDelegateChromeOSTest() : user_manager_(NULL) { | 52 SessionControllerClientTest() {} |
53 } | 53 ~SessionControllerClientTest() override {} |
54 | |
55 ~SessionStateDelegateChromeOSTest() override {} | |
56 | 54 |
57 void SetUp() override { | 55 void SetUp() override { |
58 // Initialize the UserManager singleton to a fresh FakeChromeUserManager | 56 // Initialize the UserManager singleton to a fresh FakeChromeUserManager |
59 // instance. | 57 // instance. |
60 user_manager_ = new FakeChromeUserManager; | 58 user_manager_ = new FakeChromeUserManager; |
61 user_manager_enabler_.reset( | 59 user_manager_enabler_.reset( |
62 new chromeos::ScopedUserManagerEnabler(user_manager_)); | 60 new chromeos::ScopedUserManagerEnabler(user_manager_)); |
63 | 61 |
64 // Create our SessionStateDelegate to experiment with. | |
65 session_state_delegate_.reset(new SessionStateDelegateChromeos()); | |
66 testing::Test::SetUp(); | 62 testing::Test::SetUp(); |
67 } | 63 } |
68 | 64 |
69 void TearDown() override { | 65 void TearDown() override { |
70 testing::Test::TearDown(); | 66 testing::Test::TearDown(); |
71 session_state_delegate_.reset(); | |
72 user_manager_enabler_.reset(); | 67 user_manager_enabler_.reset(); |
73 user_manager_ = NULL; | 68 user_manager_ = nullptr; |
74 // Clear our cached pointer to the PolicyCertVerifier. | 69 // Clear our cached pointer to the PolicyCertVerifier. |
75 g_policy_cert_verifier_for_factory = NULL; | 70 g_policy_cert_verifier_for_factory = nullptr; |
76 profile_manager_.reset(); | 71 profile_manager_.reset(); |
77 | 72 |
78 // We must ensure that the PolicyCertVerifier outlives the | 73 // We must ensure that the PolicyCertVerifier outlives the |
79 // PolicyCertService so shutdown the profile here. Additionally, we need | 74 // PolicyCertService so shutdown the profile here. Additionally, we need |
80 // to run the message loop between freeing the PolicyCertService and | 75 // to run the message loop between freeing the PolicyCertService and |
81 // freeing the PolicyCertVerifier (see | 76 // freeing the PolicyCertVerifier (see |
82 // PolicyCertService::OnTrustAnchorsChanged() which is called from | 77 // PolicyCertService::OnTrustAnchorsChanged() which is called from |
83 // PolicyCertService::Shutdown()). | 78 // PolicyCertService::Shutdown()). |
84 base::RunLoop().RunUntilIdle(); | 79 base::RunLoop().RunUntilIdle(); |
85 } | 80 } |
86 | 81 |
87 // Add and log in a user to the session. | 82 // Add and log in a user to the session. |
88 void UserAddedToSession(std::string user) { | 83 void UserAddedToSession(std::string user) { |
89 user_manager()->AddUser(AccountId::FromUserEmail(user)); | 84 user_manager()->AddUser(AccountId::FromUserEmail(user)); |
90 user_manager()->LoginUser(AccountId::FromUserEmail(user)); | 85 user_manager()->LoginUser(AccountId::FromUserEmail(user)); |
91 } | 86 } |
92 | 87 |
93 // Get the active user. | 88 // Get the active user. |
94 const std::string& GetActiveUserEmail() { | 89 const std::string& GetActiveUserEmail() { |
95 return user_manager::UserManager::Get() | 90 return user_manager::UserManager::Get() |
96 ->GetActiveUser() | 91 ->GetActiveUser() |
97 ->GetAccountId() | 92 ->GetAccountId() |
98 .GetUserEmail(); | 93 .GetUserEmail(); |
99 } | 94 } |
100 | 95 |
101 FakeChromeUserManager* user_manager() { return user_manager_; } | 96 FakeChromeUserManager* user_manager() { return user_manager_; } |
102 SessionStateDelegateChromeos* session_state_delegate() { | |
103 return session_state_delegate_.get(); | |
104 } | |
105 | 97 |
106 void InitForMultiProfile() { | 98 void InitForMultiProfile() { |
107 profile_manager_.reset( | 99 profile_manager_.reset( |
108 new TestingProfileManager(TestingBrowserProcess::GetGlobal())); | 100 new TestingProfileManager(TestingBrowserProcess::GetGlobal())); |
109 ASSERT_TRUE(profile_manager_->SetUp()); | 101 ASSERT_TRUE(profile_manager_->SetUp()); |
110 | 102 |
111 const AccountId account_id(AccountId::FromUserEmail(kUser)); | 103 const AccountId account_id(AccountId::FromUserEmail(kUser)); |
112 const user_manager::User* user = user_manager()->AddUser(account_id); | 104 const user_manager::User* user = user_manager()->AddUser(account_id); |
113 | 105 |
114 // Note that user profiles are created after user login in reality. | 106 // Note that user profiles are created after user login in reality. |
115 user_profile_ = | 107 user_profile_ = |
116 profile_manager_->CreateTestingProfile(account_id.GetUserEmail()); | 108 profile_manager_->CreateTestingProfile(account_id.GetUserEmail()); |
117 user_profile_->set_profile_name(account_id.GetUserEmail()); | 109 user_profile_->set_profile_name(account_id.GetUserEmail()); |
118 chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting( | 110 chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting( |
119 user, user_profile_); | 111 user, user_profile_); |
120 } | 112 } |
121 | 113 |
122 content::TestBrowserThreadBundle threads_; | 114 content::TestBrowserThreadBundle threads_; |
123 std::unique_ptr<policy::PolicyCertVerifier> cert_verifier_; | 115 std::unique_ptr<policy::PolicyCertVerifier> cert_verifier_; |
124 std::unique_ptr<TestingProfileManager> profile_manager_; | 116 std::unique_ptr<TestingProfileManager> profile_manager_; |
125 TestingProfile* user_profile_; | 117 TestingProfile* user_profile_; |
126 | 118 |
127 private: | 119 private: |
128 std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_; | 120 std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_; |
129 std::unique_ptr<SessionStateDelegateChromeos> session_state_delegate_; | |
130 | 121 |
131 // Not owned. | 122 // Owned by |user_manager_enabler_|. |
132 FakeChromeUserManager* user_manager_; | 123 FakeChromeUserManager* user_manager_ = nullptr; |
133 | 124 |
134 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateChromeOSTest); | 125 DISALLOW_COPY_AND_ASSIGN(SessionControllerClientTest); |
135 }; | 126 }; |
136 | 127 |
137 // Make sure that cycling one user does not cause any harm. | 128 // Make sure that cycling one user does not cause any harm. |
138 TEST_F(SessionStateDelegateChromeOSTest, CyclingOneUser) { | 129 TEST_F(SessionControllerClientTest, CyclingOneUser) { |
139 UserAddedToSession("firstuser@test.com"); | 130 UserAddedToSession("firstuser@test.com"); |
140 | 131 |
141 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); | 132 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); |
142 session_state_delegate()->CycleActiveUser(ash::CycleUserDirection::NEXT); | 133 SessionControllerClient::DoCycleActiveUser(ash::CycleUserDirection::NEXT); |
143 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); | 134 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); |
144 session_state_delegate()->CycleActiveUser(ash::CycleUserDirection::PREVIOUS); | 135 SessionControllerClient::DoCycleActiveUser(ash::CycleUserDirection::PREVIOUS); |
145 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); | 136 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); |
146 } | 137 } |
147 | 138 |
148 // Cycle three users forwards and backwards to see that it works. | 139 // Cycle three users forwards and backwards to see that it works. |
149 TEST_F(SessionStateDelegateChromeOSTest, CyclingThreeUsers) { | 140 TEST_F(SessionControllerClientTest, CyclingThreeUsers) { |
150 UserAddedToSession("firstuser@test.com"); | 141 UserAddedToSession("firstuser@test.com"); |
151 UserAddedToSession("seconduser@test.com"); | 142 UserAddedToSession("seconduser@test.com"); |
152 UserAddedToSession("thirduser@test.com"); | 143 UserAddedToSession("thirduser@test.com"); |
153 const ash::CycleUserDirection forward = ash::CycleUserDirection::NEXT; | 144 const ash::CycleUserDirection forward = ash::CycleUserDirection::NEXT; |
154 | 145 |
155 // Cycle forward. | 146 // Cycle forward. |
156 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); | 147 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); |
157 session_state_delegate()->CycleActiveUser(forward); | 148 SessionControllerClient::DoCycleActiveUser(forward); |
158 EXPECT_EQ("seconduser@test.com", GetActiveUserEmail()); | 149 EXPECT_EQ("seconduser@test.com", GetActiveUserEmail()); |
159 session_state_delegate()->CycleActiveUser(forward); | 150 SessionControllerClient::DoCycleActiveUser(forward); |
160 EXPECT_EQ("thirduser@test.com", GetActiveUserEmail()); | 151 EXPECT_EQ("thirduser@test.com", GetActiveUserEmail()); |
161 session_state_delegate()->CycleActiveUser(forward); | 152 SessionControllerClient::DoCycleActiveUser(forward); |
162 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); | 153 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); |
163 | 154 |
164 // Cycle backwards. | 155 // Cycle backwards. |
165 const ash::CycleUserDirection backward = ash::CycleUserDirection::PREVIOUS; | 156 const ash::CycleUserDirection backward = ash::CycleUserDirection::PREVIOUS; |
166 session_state_delegate()->CycleActiveUser(backward); | 157 SessionControllerClient::DoCycleActiveUser(backward); |
167 EXPECT_EQ("thirduser@test.com", GetActiveUserEmail()); | 158 EXPECT_EQ("thirduser@test.com", GetActiveUserEmail()); |
168 session_state_delegate()->CycleActiveUser(backward); | 159 SessionControllerClient::DoCycleActiveUser(backward); |
169 EXPECT_EQ("seconduser@test.com", GetActiveUserEmail()); | 160 EXPECT_EQ("seconduser@test.com", GetActiveUserEmail()); |
170 session_state_delegate()->CycleActiveUser(backward); | 161 SessionControllerClient::DoCycleActiveUser(backward); |
171 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); | 162 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); |
172 } | 163 } |
173 | 164 |
174 // Make sure MultiProfile disabled by primary user policy. | 165 // Make sure MultiProfile disabled by primary user policy. |
175 TEST_F(SessionStateDelegateChromeOSTest, MultiProfileDisallowedByUserPolicy) { | 166 TEST_F(SessionControllerClientTest, MultiProfileDisallowedByUserPolicy) { |
176 InitForMultiProfile(); | 167 InitForMultiProfile(); |
177 EXPECT_TRUE( | 168 EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, |
178 session_state_delegate()->IsMultiProfileAllowedByPrimaryUserPolicy()); | 169 SessionControllerClient::GetAddUserSessionPolicy()); |
179 const AccountId account_id(AccountId::FromUserEmail(kUser)); | 170 const AccountId account_id(AccountId::FromUserEmail(kUser)); |
180 user_manager()->LoginUser(account_id); | 171 user_manager()->LoginUser(account_id); |
181 EXPECT_TRUE( | 172 EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_NO_ELIGIBLE_USERS, |
182 session_state_delegate()->IsMultiProfileAllowedByPrimaryUserPolicy()); | 173 SessionControllerClient::GetAddUserSessionPolicy()); |
| 174 |
| 175 user_manager()->AddUser(AccountId::FromUserEmail("bb@b.b")); |
| 176 EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, |
| 177 SessionControllerClient::GetAddUserSessionPolicy()); |
183 | 178 |
184 user_profile_->GetPrefs()->SetString( | 179 user_profile_->GetPrefs()->SetString( |
185 prefs::kMultiProfileUserBehavior, | 180 prefs::kMultiProfileUserBehavior, |
186 chromeos::MultiProfileUserController::kBehaviorNotAllowed); | 181 chromeos::MultiProfileUserController::kBehaviorNotAllowed); |
187 EXPECT_FALSE( | 182 EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_NOT_ALLOWED_PRIMARY_USER, |
188 session_state_delegate()->IsMultiProfileAllowedByPrimaryUserPolicy()); | 183 SessionControllerClient::GetAddUserSessionPolicy()); |
189 } | 184 } |
190 | 185 |
191 // Make sure MultiProfile disabled by primary user policy certificates. | 186 // Make sure MultiProfile disabled by primary user policy certificates. |
192 TEST_F(SessionStateDelegateChromeOSTest, | 187 TEST_F(SessionControllerClientTest, |
193 MultiProfileDisallowedByPolicyCertificates) { | 188 MultiProfileDisallowedByPolicyCertificates) { |
194 InitForMultiProfile(); | 189 InitForMultiProfile(); |
| 190 user_manager()->AddUser(AccountId::FromUserEmail("bb@b.b")); |
| 191 |
195 const AccountId account_id(AccountId::FromUserEmail(kUser)); | 192 const AccountId account_id(AccountId::FromUserEmail(kUser)); |
196 user_manager()->LoginUser(account_id); | 193 user_manager()->LoginUser(account_id); |
197 EXPECT_TRUE( | 194 EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, |
198 session_state_delegate()->IsMultiProfileAllowedByPrimaryUserPolicy()); | 195 SessionControllerClient::GetAddUserSessionPolicy()); |
199 policy::PolicyCertServiceFactory::SetUsedPolicyCertificates( | 196 policy::PolicyCertServiceFactory::SetUsedPolicyCertificates( |
200 account_id.GetUserEmail()); | 197 account_id.GetUserEmail()); |
201 EXPECT_FALSE( | 198 EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_NOT_ALLOWED_PRIMARY_USER, |
202 session_state_delegate()->IsMultiProfileAllowedByPrimaryUserPolicy()); | 199 SessionControllerClient::GetAddUserSessionPolicy()); |
203 | 200 |
204 // Flush tasks posted to IO. | 201 // Flush tasks posted to IO. |
205 base::RunLoop().RunUntilIdle(); | 202 base::RunLoop().RunUntilIdle(); |
206 } | 203 } |
207 | 204 |
208 // Make sure MultiProfile disabled by primary user certificates in memory. | 205 // Make sure MultiProfile disabled by primary user certificates in memory. |
209 TEST_F(SessionStateDelegateChromeOSTest, | 206 TEST_F(SessionControllerClientTest, |
210 MultiProfileDisallowedByPrimaryUserCertificatesInMemory) { | 207 MultiProfileDisallowedByPrimaryUserCertificatesInMemory) { |
211 InitForMultiProfile(); | 208 InitForMultiProfile(); |
| 209 user_manager()->AddUser(AccountId::FromUserEmail("bb@b.b")); |
| 210 |
212 const AccountId account_id(AccountId::FromUserEmail(kUser)); | 211 const AccountId account_id(AccountId::FromUserEmail(kUser)); |
213 user_manager()->LoginUser(account_id); | 212 user_manager()->LoginUser(account_id); |
214 EXPECT_TRUE( | 213 EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, |
215 session_state_delegate()->IsMultiProfileAllowedByPrimaryUserPolicy()); | 214 SessionControllerClient::GetAddUserSessionPolicy()); |
216 cert_verifier_.reset(new policy::PolicyCertVerifier(base::Closure())); | 215 cert_verifier_.reset(new policy::PolicyCertVerifier(base::Closure())); |
217 g_policy_cert_verifier_for_factory = cert_verifier_.get(); | 216 g_policy_cert_verifier_for_factory = cert_verifier_.get(); |
218 ASSERT_TRUE( | 217 ASSERT_TRUE( |
219 policy::PolicyCertServiceFactory::GetInstance()->SetTestingFactoryAndUse( | 218 policy::PolicyCertServiceFactory::GetInstance()->SetTestingFactoryAndUse( |
220 user_profile_, CreateTestPolicyCertService)); | 219 user_profile_, CreateTestPolicyCertService)); |
221 policy::PolicyCertService* service = | 220 policy::PolicyCertService* service = |
222 policy::PolicyCertServiceFactory::GetForProfile(user_profile_); | 221 policy::PolicyCertServiceFactory::GetForProfile(user_profile_); |
223 ASSERT_TRUE(service); | 222 ASSERT_TRUE(service); |
224 | 223 |
225 EXPECT_FALSE(service->has_policy_certificates()); | 224 EXPECT_FALSE(service->has_policy_certificates()); |
226 net::CertificateList certificates; | 225 net::CertificateList certificates; |
227 certificates.push_back( | 226 certificates.push_back( |
228 net::ImportCertFromFile(net::GetTestCertsDirectory(), "ok_cert.pem")); | 227 net::ImportCertFromFile(net::GetTestCertsDirectory(), "ok_cert.pem")); |
229 service->OnTrustAnchorsChanged(certificates); | 228 service->OnTrustAnchorsChanged(certificates); |
230 EXPECT_TRUE(service->has_policy_certificates()); | 229 EXPECT_TRUE(service->has_policy_certificates()); |
231 EXPECT_FALSE( | 230 EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_NOT_ALLOWED_PRIMARY_USER, |
232 session_state_delegate()->IsMultiProfileAllowedByPrimaryUserPolicy()); | 231 SessionControllerClient::GetAddUserSessionPolicy()); |
233 | 232 |
234 // Flush tasks posted to IO. | 233 // Flush tasks posted to IO. |
235 base::RunLoop().RunUntilIdle(); | 234 base::RunLoop().RunUntilIdle(); |
236 } | 235 } |
237 | 236 |
238 // Make sure adding users to multiprofiles disabled by reaching maximum | 237 // Make sure adding users to multiprofiles disabled by reaching maximum |
239 // number of users in sessions. | 238 // number of users in sessions. |
240 TEST_F(SessionStateDelegateChromeOSTest, | 239 TEST_F(SessionControllerClientTest, |
241 AddUserToMultiprofileDisallowedByMaximumUsers) { | 240 AddUserToMultiprofileDisallowedByMaximumUsers) { |
242 InitForMultiProfile(); | 241 InitForMultiProfile(); |
243 | 242 |
244 EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, | 243 EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, |
245 session_state_delegate()->GetAddUserSessionPolicy()); | 244 SessionControllerClient::GetAddUserSessionPolicy()); |
246 const AccountId account_id(AccountId::FromUserEmail(kUser)); | 245 const AccountId account_id(AccountId::FromUserEmail(kUser)); |
247 user_manager()->LoginUser(account_id); | 246 user_manager()->LoginUser(account_id); |
248 while (session_state_delegate()->NumberOfLoggedInUsers() < | 247 while (user_manager()->GetLoggedInUsers().size() < |
249 session_state_delegate()->GetMaximumNumberOfLoggedInUsers()) { | 248 session_manager::kMaxmiumNumberOfUserSessions) { |
250 UserAddedToSession("bb@b.b"); | 249 UserAddedToSession("bb@b.b"); |
251 } | 250 } |
252 EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_MAXIMUM_USERS_REACHED, | 251 EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_MAXIMUM_USERS_REACHED, |
253 session_state_delegate()->GetAddUserSessionPolicy()); | 252 SessionControllerClient::GetAddUserSessionPolicy()); |
254 } | 253 } |
255 | 254 |
256 // Make sure adding users to multiprofiles disabled by logging in all possible | 255 // Make sure adding users to multiprofiles disabled by logging in all possible |
257 // users. | 256 // users. |
258 TEST_F(SessionStateDelegateChromeOSTest, | 257 TEST_F(SessionControllerClientTest, |
259 AddUserToMultiprofileDisallowedByAllUsersLogged) { | 258 AddUserToMultiprofileDisallowedByAllUsersLogged) { |
260 InitForMultiProfile(); | 259 InitForMultiProfile(); |
261 | 260 |
262 EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, | 261 EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, |
263 session_state_delegate()->GetAddUserSessionPolicy()); | 262 SessionControllerClient::GetAddUserSessionPolicy()); |
264 const AccountId account_id(AccountId::FromUserEmail(kUser)); | 263 const AccountId account_id(AccountId::FromUserEmail(kUser)); |
265 user_manager()->LoginUser(account_id); | 264 user_manager()->LoginUser(account_id); |
266 UserAddedToSession("bb@b.b"); | 265 UserAddedToSession("bb@b.b"); |
267 EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_NO_ELIGIBLE_USERS, | 266 EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_NO_ELIGIBLE_USERS, |
268 session_state_delegate()->GetAddUserSessionPolicy()); | 267 SessionControllerClient::GetAddUserSessionPolicy()); |
269 } | 268 } |
270 | 269 |
271 // Make sure adding users to multiprofiles disabled by primary user policy. | 270 // Make sure adding users to multiprofiles disabled by primary user policy. |
272 TEST_F(SessionStateDelegateChromeOSTest, | 271 TEST_F(SessionControllerClientTest, |
273 AddUserToMultiprofileDisallowedByPrimaryUserPolicy) { | 272 AddUserToMultiprofileDisallowedByPrimaryUserPolicy) { |
274 InitForMultiProfile(); | 273 InitForMultiProfile(); |
275 | 274 |
276 EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, | 275 EXPECT_EQ(ash::AddUserSessionPolicy::ALLOWED, |
277 session_state_delegate()->GetAddUserSessionPolicy()); | 276 SessionControllerClient::GetAddUserSessionPolicy()); |
278 const AccountId account_id(AccountId::FromUserEmail(kUser)); | 277 const AccountId account_id(AccountId::FromUserEmail(kUser)); |
279 user_manager()->LoginUser(account_id); | 278 user_manager()->LoginUser(account_id); |
280 user_profile_->GetPrefs()->SetString( | 279 user_profile_->GetPrefs()->SetString( |
281 prefs::kMultiProfileUserBehavior, | 280 prefs::kMultiProfileUserBehavior, |
282 chromeos::MultiProfileUserController::kBehaviorNotAllowed); | 281 chromeos::MultiProfileUserController::kBehaviorNotAllowed); |
283 user_manager()->AddUser(AccountId::FromUserEmail("bb@b.b")); | 282 user_manager()->AddUser(AccountId::FromUserEmail("bb@b.b")); |
284 EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_NOT_ALLOWED_PRIMARY_USER, | 283 EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_NOT_ALLOWED_PRIMARY_USER, |
285 session_state_delegate()->GetAddUserSessionPolicy()); | 284 SessionControllerClient::GetAddUserSessionPolicy()); |
286 } | 285 } |
287 | |
288 } // namespace chromeos | |
OLD | NEW |