Revert of Introduce SessionManager that will contain code to start user session on Chrome OS

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2013 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/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 32 matching lines @@
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/auth/authenticator.h"
 #include "chrome/browser/chromeos/login/auth/key.h"
 #include "chrome/browser/chromeos/login/auth/user_context.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/login_wizard.h"
-#include "chrome/browser/chromeos/login/session/session_manager.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
 #include "chrome/browser/chromeos/net/network_portal_detector.h"
 #include "chrome/browser/chromeos/options/cert_library.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
@@ skipping 91 matching lines @@
 
   virtual void OnLoginFailure(const LoginFailure& error) OVERRIDE {
     LOG(ERROR) << "Login Failure: " << error.GetErrorString();
     delete this;
   }
 
   virtual void OnLoginSuccess(const UserContext& user_context) OVERRIDE {
     if (!profile_prepared_) {
       // Will call OnProfilePrepared in the end.
       LoginUtils::Get()->PrepareProfile(user_context,
+                                        std::string(),  // display_email
                                         false,          // has_cookies
                                         true,           // has_active_session
                                         this);
     } else {
       delete this;
     }
   }
 
   // LoginUtils::Delegate implementation:
   virtual void OnProfilePrepared(Profile* profile) OVERRIDE {
@@ skipping 54 matching lines @@
         parsed_command_line.GetSwitchValueASCII(switches::kLoginUser),
         parsed_command_line.GetSwitchValueASCII(switches::kLoginPassword));
   } else {
     if (!parsed_command_line.HasSwitch(::switches::kTestName)) {
       // Enable CrasAudioHandler logging when chrome restarts after crashing.
       if (chromeos::CrasAudioHandler::IsInitialized())
         chromeos::CrasAudioHandler::Get()->LogErrors();
 
       // We did not log in (we crashed or are debugging), so we need to
       // restore Sync.
-      SessionManager::GetInstance()->RestoreAuthenticationSession(profile);
+      LoginUtils::Get()->RestoreAuthenticationSession(profile);
     }
   }
 }
 
 }  // namespace
 
 namespace internal {
 
 // Wrapper class for initializing dbus related services and shutting them
 // down. This gets instantiated in a scoped_ptr so that shutdown methods in the
@@ skipping 375 matching lines @@
     std::string login_user = login::CanonicalizeUserID(
         parsed_command_line().GetSwitchValueASCII(
             chromeos::switches::kLoginUser));
     if (!base::SysInfo::IsRunningOnChromeOS() &&
         login_user == UserManager::kStubUser) {
       // For dev machines and stub user emulate as if sync has been initialized.
       profile()->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
                                        login_user);
     }
 
-    // This is done in SessionManager::OnProfileCreated during normal login.
-    SessionManager::GetInstance()->InitRlz(profile());
+    // This is done in LoginUtils::OnProfileCreated during normal login.
+    LoginUtils::Get()->InitRlzDelayed(profile());
 
     // Send the PROFILE_PREPARED notification and call SessionStarted()
     // so that the Launcher and other Profile dependent classes are created.
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
         content::NotificationService::AllSources(),
         content::Details<Profile>(profile()));
     UserManager::Get()->SessionStarted();
 
     // Now is the good time to retrieve other logged in users for this session.
@@ skipping 218 matching lines @@
   // Destroy DBus services immediately after threads are stopped.
   dbus_services_.reset();
 
   ChromeBrowserMainPartsLinux::PostDestroyThreads();
 
   // Destroy DeviceSettingsService after g_browser_process.
   DeviceSettingsService::Shutdown();
 }
 
 }  //  namespace chromeos