Index: chrome/browser/chromeos/login/users/user_manager_impl.cc |
diff --git a/chrome/browser/chromeos/login/users/user_manager_impl.cc b/chrome/browser/chromeos/login/users/user_manager_impl.cc |
index f9726b166080c32f2951c8a676a107d5e438addf..53911f2ffe218b7fca14da846a72ad94e6c8005c 100644 |
--- a/chrome/browser/chromeos/login/users/user_manager_impl.cc |
+++ b/chrome/browser/chromeos/login/users/user_manager_impl.cc |
@@ -35,6 +35,7 @@ |
#include "chrome/browser/chromeos/login/auth/user_context.h" |
#include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" |
#include "chrome/browser/chromeos/login/login_utils.h" |
+#include "chrome/browser/chromeos/login/session/session_manager.h" |
#include "chrome/browser/chromeos/login/signin/auth_sync_observer.h" |
#include "chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h" |
#include "chrome/browser/chromeos/login/ui/login_display.h" |
@@ -1200,7 +1201,7 @@ void UserManagerImpl::OnProfilePrepared(Profile* profile) { |
// users once it is fully multi-profile aware. http://crbug.com/238987 |
// For now if we have other user pending sessions they'll override OAuth |
// session restore for previous users. |
- LoginUtils::Get()->RestoreAuthenticationSession(profile); |
+ SessionManager::GetInstance()->RestoreAuthenticationSession(profile); |
} |
// Restore other user sessions if any. |
@@ -2033,7 +2034,6 @@ void UserManagerImpl::RestorePendingUserSessions() { |
user_context.SetIsUsingOAuth(false); |
// Will call OnProfilePrepared() once profile has been loaded. |
LoginUtils::Get()->PrepareProfile(user_context, |
- std::string(), // display_email |
false, // has_cookies |
true, // has_active_session |
this); |