| Index: chrome/browser/chromeos/login/users/user_manager_unittest.cc
|
| diff --git a/chrome/browser/chromeos/login/users/user_manager_unittest.cc b/chrome/browser/chromeos/login/users/user_manager_unittest.cc
|
| index 638f16d130cce365a360ce38f9d1de9c3a2e576d..b6ccfd8baf97686b8ddd751e878157abf3dcabec 100644
|
| --- a/chrome/browser/chromeos/login/users/user_manager_unittest.cc
|
| +++ b/chrome/browser/chromeos/login/users/user_manager_unittest.cc
|
| @@ -104,7 +104,7 @@ class UserManagerTest : public testing::Test {
|
| }
|
|
|
| UserManagerImpl* GetUserManagerImpl() const {
|
| - return static_cast<UserManagerImpl*>(UserManager::Get());
|
| + return static_cast<UserManagerImpl*>(GetUserManager());
|
| }
|
|
|
| bool GetUserManagerEphemeralUsersEnabled() const {
|
| @@ -175,17 +175,17 @@ TEST_F(UserManagerTest, RetrieveTrustedDevicePolicies) {
|
| }
|
|
|
| TEST_F(UserManagerTest, RemoveAllExceptOwnerFromList) {
|
| - UserManager::Get()->UserLoggedIn(
|
| + GetUserManager()->UserLoggedIn(
|
| "owner@invalid.domain", "owner@invalid.domain", false);
|
| ResetUserManager();
|
| - UserManager::Get()->UserLoggedIn(
|
| + GetUserManager()->UserLoggedIn(
|
| "user0@invalid.domain", "owner@invalid.domain", false);
|
| ResetUserManager();
|
| - UserManager::Get()->UserLoggedIn(
|
| + GetUserManager()->UserLoggedIn(
|
| "user1@invalid.domain", "owner@invalid.domain", false);
|
| ResetUserManager();
|
|
|
| - const UserList* users = &UserManager::Get()->GetUsers();
|
| + const UserList* users = &GetUserManager()->GetUsers();
|
| ASSERT_EQ(3U, users->size());
|
| EXPECT_EQ((*users)[0]->email(), "user1@invalid.domain");
|
| EXPECT_EQ((*users)[1]->email(), "user0@invalid.domain");
|
| @@ -194,7 +194,7 @@ TEST_F(UserManagerTest, RemoveAllExceptOwnerFromList) {
|
| SetDeviceSettings(true, "owner@invalid.domain", false);
|
| RetrieveTrustedDevicePolicies();
|
|
|
| - users = &UserManager::Get()->GetUsers();
|
| + users = &GetUserManager()->GetUsers();
|
| EXPECT_EQ(1U, users->size());
|
| EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain");
|
| }
|
| @@ -203,14 +203,14 @@ TEST_F(UserManagerTest, RegularUserLoggedInAsEphemeral) {
|
| SetDeviceSettings(true, "owner@invalid.domain", false);
|
| RetrieveTrustedDevicePolicies();
|
|
|
| - UserManager::Get()->UserLoggedIn(
|
| + GetUserManager()->UserLoggedIn(
|
| "owner@invalid.domain", "user0@invalid.domain", false);
|
| ResetUserManager();
|
| - UserManager::Get()->UserLoggedIn(
|
| + GetUserManager()->UserLoggedIn(
|
| "user0@invalid.domain", "user0@invalid.domain", false);
|
| ResetUserManager();
|
|
|
| - const UserList* users = &UserManager::Get()->GetUsers();
|
| + const UserList* users = &GetUserManager()->GetUsers();
|
| EXPECT_EQ(1U, users->size());
|
| EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain");
|
| }
|
|
|