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

Unified Diff: chrome/browser/chromeos/login/login_manager_test.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/login_manager_test.cc
diff --git a/chrome/browser/chromeos/login/login_manager_test.cc b/chrome/browser/chromeos/login/login_manager_test.cc
index 09f059471c725377ac4971c50fa9afb62b46a82e..9314f0ca341239b6e0c6410a95d353f743115c3c 100644
--- a/chrome/browser/chromeos/login/login_manager_test.cc
+++ b/chrome/browser/chromeos/login/login_manager_test.cc
@@ -67,7 +67,7 @@ void LoginManagerTest::SetExpectedCredentials(const UserContext& user_context) {
bool LoginManagerTest::TryToLogin(const UserContext& user_context) {
if (!AddUserToSession(user_context))
return false;
- if (const User* active_user = UserManager::Get()->GetActiveUser())
+ if (const User* active_user = GetUserManager()->GetActiveUser())
return active_user->email() == user_context.GetUserID();
return false;
}
@@ -83,7 +83,7 @@ bool LoginManagerTest::AddUserToSession(const UserContext& user_context) {
content::WindowedNotificationObserver(
chrome::NOTIFICATION_SESSION_STARTED,
content::NotificationService::AllSources()).Wait();
- const UserList& logged_users = UserManager::Get()->GetLoggedInUsers();
+ const UserList& logged_users = GetUserManager()->GetLoggedInUsers();
for (UserList::const_iterator it = logged_users.begin();
it != logged_users.end(); ++it) {
if ((*it)->email() == user_context.GetUserID())
« no previous file with comments | « chrome/browser/chromeos/login/lock/screen_locker.cc ('k') | chrome/browser/chromeos/login/login_screen_policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698