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

Unified Diff: chrome/browser/chromeos/login/managed/managed_user_test_base.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
Index: chrome/browser/chromeos/login/managed/managed_user_test_base.cc
diff --git a/chrome/browser/chromeos/login/managed/managed_user_test_base.cc b/chrome/browser/chromeos/login/managed/managed_user_test_base.cc
index a69d22f1aaa202bce9d77a75ec06a5875093eeaf..c25755ad5606b114618448c351a479eb5f44fabf 100644
--- a/chrome/browser/chromeos/login/managed/managed_user_test_base.cc
+++ b/chrome/browser/chromeos/login/managed/managed_user_test_base.cc
@@ -303,8 +303,8 @@ void ManagedUserTestBase::StartFlowLoginAsManager() {
login_observer.Wait();
// OAuth token is valid.
- UserManager::Get()->SaveUserOAuthStatus(kTestManager,
- User::OAUTH2_TOKEN_STATUS_VALID);
+ GetUserManager()->SaveUserOAuthStatus(kTestManager,
+ User::OAUTH2_TOKEN_STATUS_VALID);
base::RunLoop().RunUntilIdle();
// Check the page have changed.
@@ -360,10 +360,10 @@ void ManagedUserTestBase::SigninAsSupervisedUser(
EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1);
// Log in as supervised user, make sure that everything works.
- ASSERT_EQ(3UL, UserManager::Get()->GetUsers().size());
+ ASSERT_EQ(3UL, GetUserManager()->GetUsers().size());
// Created supervised user have to be first in a list.
- const User* user = UserManager::Get()->GetUsers().at(user_index);
+ const User* user = GetUserManager()->GetUsers().at(user_index);
ASSERT_EQ(base::UTF8ToUTF16(expected_display_name), user->display_name());
LoginUser(user->email());
if (check_homedir_calls)
@@ -379,10 +379,10 @@ void ManagedUserTestBase::SigninAsSupervisedUser(
void ManagedUserTestBase::SigninAsManager(int user_index) {
// Log in as supervised user, make sure that everything works.
- ASSERT_EQ(3UL, UserManager::Get()->GetUsers().size());
+ ASSERT_EQ(3UL, GetUserManager()->GetUsers().size());
// Created supervised user have to be first in a list.
- const User* user = UserManager::Get()->GetUsers().at(user_index);
+ const User* user = GetUserManager()->GetUsers().at(user_index);
LoginUser(user->email());
Profile* profile = ProfileHelper::Get()->GetProfileByUser(user);
shared_settings_adapter_.reset(
@@ -395,10 +395,10 @@ void ManagedUserTestBase::RemoveSupervisedUser(
int user_index,
const std::string& expected_display_name) {
// Remove supervised user.
- ASSERT_EQ(original_user_count, UserManager::Get()->GetUsers().size());
+ ASSERT_EQ(original_user_count, GetUserManager()->GetUsers().size());
// Created supervised user have to be first in a list.
- const User* user = UserManager::Get()->GetUsers().at(user_index);
+ const User* user = GetUserManager()->GetUsers().at(user_index);
ASSERT_EQ(base::UTF8ToUTF16(expected_display_name), user->display_name());
// Open pod menu.
@@ -429,7 +429,7 @@ void ManagedUserTestBase::RemoveSupervisedUser(
user_index));
// Make sure there is no supervised user in list.
- ASSERT_EQ(original_user_count - 1, UserManager::Get()->GetUsers().size());
+ ASSERT_EQ(original_user_count - 1, GetUserManager()->GetUsers().size());
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698