chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc - Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager().

Unified Diff: chrome/browser/chromeos/login/managed/managed_user_password_browsertest.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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/managed/managed_user_creation_controller_old.cc ('k') | chrome/browser/chromeos/login/managed/managed_user_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc

diff --git a/chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc b/chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc

index 161c9914de2ea50d2885712d35d8e2acec2e5e97..f47592d9e6faa2696e380f37d05cacad425d6d78 100644

--- a/chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc

+++ b/chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc

@@ -78,9 +78,9 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,

DISABLED_PRE_PasswordChangeFromUserTest) {

SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName);

- const User* user = UserManager::Get()->GetUsers().at(0);

+ const User* user = GetUserManager()->GetUsers().at(0);

std::string sync_id =

- UserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(

+ GetUserManager()->GetSupervisedUserManager()->GetUserSyncId(

user->email());

base::DictionaryValue password;

password.SetIntegerWithoutPathExpansion(

@@ -123,14 +123,14 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,

// update, and performs migration.

IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,

DISABLED_PRE_PasswordChangeFromManagerTest) {

- const User* managed_user = UserManager::Get()->GetUsers().at(0);

+ const User* managed_user = GetUserManager()->GetUsers().at(0);

SigninAsManager(1);

EXPECT_CALL(*mock_homedir_methods_, AddKeyEx(_, _, _, _, _)).Times(1);

std::string sync_id =

- UserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(

+ GetUserManager()->GetSupervisedUserManager()->GetUserSyncId(

managed_user->email());

::sync_pb::ManagedUserSpecifics managed_user_proto;

@@ -189,9 +189,9 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,

DISABLED_PRE_PRE_PasswordChangeUserAndManagerTest) {

SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName);

- const User* user = UserManager::Get()->GetUsers().at(0);

+ const User* user = GetUserManager()->GetUsers().at(0);

std::string sync_id =

- UserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(

+ GetUserManager()->GetSupervisedUserManager()->GetUserSyncId(

user->email());

base::DictionaryValue password;

password.SetIntegerWithoutPathExpansion(

@@ -211,14 +211,14 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,

// performs the migration.

IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,

DISABLED_PRE_PasswordChangeUserAndManagerTest) {

- const User* managed_user = UserManager::Get()->GetUsers().at(0);

+ const User* managed_user = GetUserManager()->GetUsers().at(0);

SigninAsManager(1);

EXPECT_CALL(*mock_homedir_methods_, AddKeyEx(_, _, _, _, _)).Times(1);

std::string sync_id =

- UserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(

+ GetUserManager()->GetSupervisedUserManager()->GetUserSyncId(

managed_user->email());

::sync_pb::ManagedUserSpecifics managed_user_proto;