cros: Fix inconsistent SessionController state for tests

chrome/browser/chromeos/login/session/chrome_session_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/session/chrome_session_manager.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 67 matching lines @@
     PrefService* local_state = g_browser_process->local_state();
     local_state->ClearPref(prefs::kRebootAfterUpdate);
   }
 }
 
 // Restores user sessions for a crash-and-restarted chrome.
 void StartRestoreAfterCrashSession(Profile* user_profile,
                                    const std::string& login_user_id) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
-  session_manager::SessionManager::Get()->SetSessionState(
-      session_manager::SessionState::ACTIVE);
-
   // TODO(xiyuan): Identify tests that do not set this kLoginUser flag but
   // still rely on "stub user" session. Keeping existing behavior to avoid
   // breaking tests.
   if (command_line->HasSwitch(chromeos::switches::kLoginUser)) {
     // This is done in SessionManager::OnProfileCreated during normal login.
     UserSessionManager* user_session_mgr = UserSessionManager::GetInstance();
     user_manager::UserManager* user_manager = user_manager::UserManager::Get();
     const user_manager::User* user = user_manager->GetActiveUser();
     if (!user) {
       // This is possible if crash occured after profile removal
@@ skipping 39 matching lines @@
     // We did not log in (we crashed or are debugging), so we need to
     // restore Sync.
     UserSessionManager::GetInstance()->RestoreAuthenticationSession(
         user_profile);
   }
 }
 
 // Starts a user session with stub user.
 void StartStubLoginSession(Profile* user_profile,
                            const std::string& login_user_id) {
-  session_manager::SessionManager::Get()->SetSessionState(
-      session_manager::SessionState::ACTIVE);
-
   // For dev machines and stub user emulate as if sync has been initialized.
   SigninManagerFactory::GetForProfile(user_profile)
       ->SetAuthenticatedAccountInfo(login_user_id, login_user_id);
   StartRestoreAfterCrashSession(user_profile, login_user_id);
 }
 
 }  // namespace
 
 ChromeSessionManager::ChromeSessionManager() {}
 ChromeSessionManager::~ChromeSessionManager() {}
@@ skipping 75 matching lines @@
                                               const std::string& user_id_hash,
                                               bool browser_restart) {
   BootTimesRecorder* btl = BootTimesRecorder::Get();
   btl->AddLoginTimeMarker("UserLoggedIn-Start", false);
   session_manager::SessionManager::NotifyUserLoggedIn(
       user_account_id, user_id_hash, browser_restart);
   btl->AddLoginTimeMarker("UserLoggedIn-End", false);
 }
 
 }  // namespace chromeos