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

Unified Diff: chrome/browser/chromeos/login/crash_restore_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/crash_restore_browsertest.cc
diff --git a/chrome/browser/chromeos/login/crash_restore_browsertest.cc b/chrome/browser/chromeos/login/crash_restore_browsertest.cc
index a37442c6292ef8b1d05a5b5a019b03e37577f950..e4eba17fdbe4d855f30f4af6efc3de19059c95a8 100644
--- a/chrome/browser/chromeos/login/crash_restore_browsertest.cc
+++ b/chrome/browser/chromeos/login/crash_restore_browsertest.cc
@@ -58,7 +58,7 @@ class CrashRestoreSimpleTest : public InProcessBrowserTest {
};
IN_PROC_BROWSER_TEST_F(CrashRestoreSimpleTest, RestoreSessionForOneUser) {
- UserManager* user_manager = UserManager::Get();
+ UserManager* user_manager = GetUserManager();
User* user = user_manager->GetActiveUser();
ASSERT_TRUE(user);
EXPECT_EQ(kUserId1, user->email());
@@ -73,15 +73,15 @@ class UserSessionRestoreObserver :
public:
UserSessionRestoreObserver()
: running_loop_(false),
- user_sessions_restored_(UserManager::Get()->UserSessionsRestored()) {
+ user_sessions_restored_(GetUserManager()->UserSessionsRestored()) {
if (!user_sessions_restored_)
- UserManager::Get()->AddSessionStateObserver(this);
+ GetUserManager()->AddSessionStateObserver(this);
}
virtual ~UserSessionRestoreObserver() {}
virtual void PendingUserSessionsRestoreFinished() OVERRIDE {
user_sessions_restored_ = true;
- UserManager::Get()->RemoveSessionStateObserver(this);
+ GetUserManager()->RemoveSessionStateObserver(this);
if (!running_loop_)
return;
@@ -127,7 +127,7 @@ IN_PROC_BROWSER_TEST_F(CrashRestoreComplexTest, RestoreSessionForThreeUsers) {
restore_observer.Wait();
}
- UserManager* user_manager = UserManager::Get();
+ UserManager* user_manager = GetUserManager();
DCHECK(user_manager->UserSessionsRestored());
// User that is last in the user sessions map becomes active. This behavior

Powered by Google App Engine
This is Rietveld 408576698