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

Unified Diff: chrome/browser/chromeos/login/signin/oauth2_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
Index: chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
diff --git a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
index 7a9c8ba8843f81b306497ed456c5f34c3132c93a..80ac6595182550442781d32cd5a641897e5dbde6 100644
--- a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
+++ b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
@@ -191,7 +191,7 @@ class OAuth2Test : public OobeBaseTest {
if (!AddUserToSession(username, password))
return false;
- if (const User* active_user = UserManager::Get()->GetActiveUser())
+ if (const User* active_user = GetUserManager()->GetActiveUser())
return active_user->email() == username;
return false;
@@ -216,7 +216,7 @@ class OAuth2Test : public OobeBaseTest {
protected:
// OobeBaseTest overrides.
virtual Profile* profile() OVERRIDE {
- if (UserManager::Get()->GetActiveUser())
+ if (GetUserManager()->GetActiveUser())
return ProfileManager::GetPrimaryUserProfile();
return OobeBaseTest::profile();
@@ -237,7 +237,7 @@ class OAuth2Test : public OobeBaseTest {
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() == username)

Powered by Google App Engine
This is Rietveld 408576698