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 <cstdlib> | 5 #include <cstdlib> |
6 #include <cstring> | 6 #include <cstring> |
7 | 7 |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/files/scoped_temp_dir.h" | 9 #include "base/files/scoped_temp_dir.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
11 #include "base/prefs/pref_service.h" | 11 #include "base/prefs/pref_service.h" |
12 #include "base/run_loop.h" | 12 #include "base/run_loop.h" |
13 #include "base/values.h" | 13 #include "base/values.h" |
14 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
15 #include "chrome/browser/chromeos/login/users/user.h" | |
16 #include "chrome/browser/chromeos/login/users/user_manager.h" | 15 #include "chrome/browser/chromeos/login/users/user_manager.h" |
17 #include "chrome/browser/chromeos/login/users/user_manager_impl.h" | 16 #include "chrome/browser/chromeos/login/users/user_manager_impl.h" |
18 #include "chrome/browser/chromeos/settings/cros_settings.h" | 17 #include "chrome/browser/chromeos/settings/cros_settings.h" |
19 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 18 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
20 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" | 19 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" |
21 #include "chrome/browser/profiles/profile_manager.h" | 20 #include "chrome/browser/profiles/profile_manager.h" |
22 #include "chrome/test/base/scoped_testing_local_state.h" | 21 #include "chrome/test/base/scoped_testing_local_state.h" |
23 #include "chrome/test/base/testing_browser_process.h" | 22 #include "chrome/test/base/testing_browser_process.h" |
24 #include "chrome/test/base/testing_profile.h" | 23 #include "chrome/test/base/testing_profile.h" |
25 #include "chromeos/chromeos_switches.h" | 24 #include "chromeos/chromeos_switches.h" |
26 #include "chromeos/dbus/dbus_thread_manager.h" | 25 #include "chromeos/dbus/dbus_thread_manager.h" |
27 #include "chromeos/dbus/fake_dbus_thread_manager.h" | 26 #include "chromeos/dbus/fake_dbus_thread_manager.h" |
28 #include "chromeos/settings/cros_settings_names.h" | 27 #include "chromeos/settings/cros_settings_names.h" |
29 #include "chromeos/settings/cros_settings_provider.h" | 28 #include "chromeos/settings/cros_settings_provider.h" |
| 29 #include "components/user_manager/user.h" |
30 #include "content/public/common/content_switches.h" | 30 #include "content/public/common/content_switches.h" |
31 #include "content/public/test/test_browser_thread_bundle.h" | 31 #include "content/public/test/test_browser_thread_bundle.h" |
32 #include "testing/gtest/include/gtest/gtest.h" | 32 #include "testing/gtest/include/gtest/gtest.h" |
33 | 33 |
34 namespace chromeos { | 34 namespace chromeos { |
35 | 35 |
36 class UnittestProfileManager : public ::ProfileManagerWithoutInit { | 36 class UnittestProfileManager : public ::ProfileManagerWithoutInit { |
37 public: | 37 public: |
38 explicit UnittestProfileManager(const base::FilePath& user_data_dir) | 38 explicit UnittestProfileManager(const base::FilePath& user_data_dir) |
39 : ::ProfileManagerWithoutInit(user_data_dir) {} | 39 : ::ProfileManagerWithoutInit(user_data_dir) {} |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 UserManager::Get()->UserLoggedIn( | 178 UserManager::Get()->UserLoggedIn( |
179 "owner@invalid.domain", "owner@invalid.domain", false); | 179 "owner@invalid.domain", "owner@invalid.domain", false); |
180 ResetUserManager(); | 180 ResetUserManager(); |
181 UserManager::Get()->UserLoggedIn( | 181 UserManager::Get()->UserLoggedIn( |
182 "user0@invalid.domain", "owner@invalid.domain", false); | 182 "user0@invalid.domain", "owner@invalid.domain", false); |
183 ResetUserManager(); | 183 ResetUserManager(); |
184 UserManager::Get()->UserLoggedIn( | 184 UserManager::Get()->UserLoggedIn( |
185 "user1@invalid.domain", "owner@invalid.domain", false); | 185 "user1@invalid.domain", "owner@invalid.domain", false); |
186 ResetUserManager(); | 186 ResetUserManager(); |
187 | 187 |
188 const UserList* users = &UserManager::Get()->GetUsers(); | 188 const user_manager::UserList* users = &UserManager::Get()->GetUsers(); |
189 ASSERT_EQ(3U, users->size()); | 189 ASSERT_EQ(3U, users->size()); |
190 EXPECT_EQ((*users)[0]->email(), "user1@invalid.domain"); | 190 EXPECT_EQ((*users)[0]->email(), "user1@invalid.domain"); |
191 EXPECT_EQ((*users)[1]->email(), "user0@invalid.domain"); | 191 EXPECT_EQ((*users)[1]->email(), "user0@invalid.domain"); |
192 EXPECT_EQ((*users)[2]->email(), "owner@invalid.domain"); | 192 EXPECT_EQ((*users)[2]->email(), "owner@invalid.domain"); |
193 | 193 |
194 SetDeviceSettings(true, "owner@invalid.domain", false); | 194 SetDeviceSettings(true, "owner@invalid.domain", false); |
195 RetrieveTrustedDevicePolicies(); | 195 RetrieveTrustedDevicePolicies(); |
196 | 196 |
197 users = &UserManager::Get()->GetUsers(); | 197 users = &UserManager::Get()->GetUsers(); |
198 EXPECT_EQ(1U, users->size()); | 198 EXPECT_EQ(1U, users->size()); |
199 EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain"); | 199 EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain"); |
200 } | 200 } |
201 | 201 |
202 TEST_F(UserManagerTest, RegularUserLoggedInAsEphemeral) { | 202 TEST_F(UserManagerTest, RegularUserLoggedInAsEphemeral) { |
203 SetDeviceSettings(true, "owner@invalid.domain", false); | 203 SetDeviceSettings(true, "owner@invalid.domain", false); |
204 RetrieveTrustedDevicePolicies(); | 204 RetrieveTrustedDevicePolicies(); |
205 | 205 |
206 UserManager::Get()->UserLoggedIn( | 206 UserManager::Get()->UserLoggedIn( |
207 "owner@invalid.domain", "user0@invalid.domain", false); | 207 "owner@invalid.domain", "user0@invalid.domain", false); |
208 ResetUserManager(); | 208 ResetUserManager(); |
209 UserManager::Get()->UserLoggedIn( | 209 UserManager::Get()->UserLoggedIn( |
210 "user0@invalid.domain", "user0@invalid.domain", false); | 210 "user0@invalid.domain", "user0@invalid.domain", false); |
211 ResetUserManager(); | 211 ResetUserManager(); |
212 | 212 |
213 const UserList* users = &UserManager::Get()->GetUsers(); | 213 const user_manager::UserList* users = &UserManager::Get()->GetUsers(); |
214 EXPECT_EQ(1U, users->size()); | 214 EXPECT_EQ(1U, users->size()); |
215 EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain"); | 215 EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain"); |
216 } | 216 } |
217 | 217 |
218 } // namespace chromeos | 218 } // namespace chromeos |
OLD | NEW |