Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: chrome/browser/chromeos/login/users/user_manager_unittest.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 97
98 // Shut down the DeviceSettingsService. 98 // Shut down the DeviceSettingsService.
99 DeviceSettingsService::Get()->UnsetSessionManager(); 99 DeviceSettingsService::Get()->UnsetSessionManager();
100 TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL); 100 TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL);
101 101
102 base::RunLoop().RunUntilIdle(); 102 base::RunLoop().RunUntilIdle();
103 chromeos::DBusThreadManager::Shutdown(); 103 chromeos::DBusThreadManager::Shutdown();
104 } 104 }
105 105
106 UserManagerImpl* GetUserManagerImpl() const { 106 UserManagerImpl* GetUserManagerImpl() const {
107 return static_cast<UserManagerImpl*>(UserManager::Get()); 107 return static_cast<UserManagerImpl*>(GetUserManager());
108 } 108 }
109 109
110 bool GetUserManagerEphemeralUsersEnabled() const { 110 bool GetUserManagerEphemeralUsersEnabled() const {
111 return GetUserManagerImpl()->ephemeral_users_enabled_; 111 return GetUserManagerImpl()->ephemeral_users_enabled_;
112 } 112 }
113 113
114 void SetUserManagerEphemeralUsersEnabled(bool ephemeral_users_enabled) { 114 void SetUserManagerEphemeralUsersEnabled(bool ephemeral_users_enabled) {
115 GetUserManagerImpl()->ephemeral_users_enabled_ = ephemeral_users_enabled; 115 GetUserManagerImpl()->ephemeral_users_enabled_ = ephemeral_users_enabled;
116 } 116 }
117 117
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 SetUserManagerOwnerEmail(""); 168 SetUserManagerOwnerEmail("");
169 169
170 SetDeviceSettings(false, "owner@invalid.domain", false); 170 SetDeviceSettings(false, "owner@invalid.domain", false);
171 RetrieveTrustedDevicePolicies(); 171 RetrieveTrustedDevicePolicies();
172 172
173 EXPECT_FALSE(GetUserManagerEphemeralUsersEnabled()); 173 EXPECT_FALSE(GetUserManagerEphemeralUsersEnabled());
174 EXPECT_EQ(GetUserManagerOwnerEmail(), "owner@invalid.domain"); 174 EXPECT_EQ(GetUserManagerOwnerEmail(), "owner@invalid.domain");
175 } 175 }
176 176
177 TEST_F(UserManagerTest, RemoveAllExceptOwnerFromList) { 177 TEST_F(UserManagerTest, RemoveAllExceptOwnerFromList) {
178 UserManager::Get()->UserLoggedIn( 178 GetUserManager()->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 GetUserManager()->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 GetUserManager()->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 UserList* users = &GetUserManager()->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 = &GetUserManager()->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 GetUserManager()->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 GetUserManager()->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 UserList* users = &GetUserManager()->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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698