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

Unified Diff: chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc

Issue 460423002: Fix CertLoader initialization on browser restart. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Missing parantheses. Created 6 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/session/user_session_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc
diff --git a/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc b/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc
index 53cfe9f4b495f4893a032a50514af5fa328efe9b..31c6513dbf2bafe3cba53ac0f6cf9f3de8f5cd57 100644
--- a/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc
+++ b/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc
@@ -36,7 +36,9 @@ void RestoreAfterCrashSessionManagerDelegate::Start() {
// breaking tests.
if (command_line->HasSwitch(chromeos::switches::kLoginUser)) {
// This is done in SessionManager::OnProfileCreated during normal login.
- UserSessionManager::GetInstance()->InitRlz(profile());
+ UserSessionManager* user_session_mgr = UserSessionManager::GetInstance();
+ user_session_mgr->InitRlz(profile());
+ user_session_mgr->InitializeCerts(profile());
// Send the PROFILE_PREPARED notification and call SessionStarted()
// so that the Launcher and other Profile dependent classes are created.
@@ -51,7 +53,7 @@ void RestoreAfterCrashSessionManagerDelegate::Start() {
// Now is the good time to retrieve other logged in users for this session.
// First user has been already marked as logged in and active in
// PreProfileInit(). Restore sessions for other users in the background.
- UserSessionManager::GetInstance()->RestoreActiveSessions();
+ user_session_mgr->RestoreActiveSessions();
}
bool is_running_test = command_line->HasSwitch(::switches::kTestName) ||
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/session/user_session_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698