Revert of Start session fail causes restart chrome

chrome/browser/chromeos/login/login_utils.cc

 // Copyright (c) 2012 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/login_utils.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 182 matching lines @@
   void UserProfileInitialized(Profile* user_profile);
 
   // Callback for Profile::CREATE_STATUS_INITIALIZED profile state for an OTR
   // login.
   void OTRProfileInitialized(Profile* user_profile);
 
   // Callback to resume profile creation after transferring auth data from
   // the authentication profile.
   void CompleteProfileCreate(Profile* user_profile);
 
-  // Callback to resume profile preparing after start session.
-  void OnSessionStarted(const UserContext& user_context,
-                        const std::string& display_email,
-                        bool has_cookies,
-                        LoginUtils::Delegate* delegate,
-                        bool success);
-
-  // Complete profile preparation with having active session.
-  void CompletePrepareProfileWithActiveSession(const UserContext& user_context,
-                                               const std::string& display_email,
-                                               bool has_cookies,
-                                               LoginUtils::Delegate* delegate);
-
   // Finalized profile preparation.
   void FinalizePrepareProfile(Profile* user_profile);
 
   // Initializes member variables needed for session restore process via
   // OAuthLoginManager.
   void InitSessionRestoreStrategy();
 
   // Restores GAIA auth cookies for the created user profile from OAuth2 token.
   void RestoreAuthSession(Profile* user_profile,
                           bool restore_from_auth_cookies);
@@ skipping 180 matching lines @@
     bool has_cookies,
     bool has_active_session,
     LoginUtils::Delegate* delegate) {
   BootTimesLoader* btl = BootTimesLoader::Get();
 
   VLOG(1) << "Completing login for " << user_context.username;
 
   if (!has_active_session) {
     btl->AddLoginTimeMarker("StartSession-Start", false);
     DBusThreadManager::Get()->GetSessionManagerClient()->StartSession(
-        user_context.username,
-        base::Bind(&LoginUtilsImpl::OnSessionStarted,
-                   AsWeakPtr(),
-                   user_context,
-                   display_email,
-                   has_cookies,
-                   delegate));
-    return;
+        user_context.username);
+    btl->AddLoginTimeMarker("StartSession-End", false);
   }
-  CompletePrepareProfileWithActiveSession(
-      user_context, display_email, has_cookies, delegate);
-}
 
-void LoginUtilsImpl::OnSessionStarted(const UserContext& user_context,
-                                      const std::string& display_email,
-                                      bool has_cookies,
-                                      LoginUtils::Delegate* delegate,
-                                      bool success) {
-  BootTimesLoader* btl = BootTimesLoader::Get();
-  btl->AddLoginTimeMarker("StartSession-End", false);
-
-  if (!success) {
-    LOG(ERROR) << "StartSession failed";
-    chrome::AttemptUserExit();
-    return;
-  }
-  CompletePrepareProfileWithActiveSession(
-      user_context, display_email, has_cookies, delegate);
-}
-
-void LoginUtilsImpl::CompletePrepareProfileWithActiveSession(
-    const UserContext& user_context,
-    const std::string& display_email,
-    bool has_cookies,
-    LoginUtils::Delegate* delegate) {
-  BootTimesLoader* btl = BootTimesLoader::Get();
   btl->AddLoginTimeMarker("UserLoggedIn-Start", false);
   UserManager* user_manager = UserManager::Get();
   user_manager->UserLoggedIn(user_context.username,
                              user_context.username_hash,
                              false);
   btl->AddLoginTimeMarker("UserLoggedIn-End", false);
 
   // Switch log file as soon as possible.
   if (base::SysInfo::IsRunningOnChromeOS())
     logging::RedirectChromeLogging(*(CommandLine::ForCurrentProcess()));
@@ skipping 540 matching lines @@
   CrosSettings* cros_settings = CrosSettings::Get();
   bool allow_new_user = false;
   cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
   if (allow_new_user)
     return true;
   return cros_settings->FindEmailInList(
       kAccountsPrefUsers, username, wildcard_match);
 }
 
 }  // namespace chromeos