session_manager: Create ChromeSessionManager early

chrome/browser/chromeos/login/ui/user_adding_screen.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/ui/user_adding_screen.h"
 
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_controller.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/user_manager/user_manager.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace chromeos {
@@ skipping 25 matching lines @@
 };
 
 void UserAddingScreenImpl::Start() {
   CHECK(!IsRunning());
   gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size()));
   display_host_ = new chromeos::LoginDisplayHostImpl(screen_bounds);
   display_host_->StartUserAdding(
       base::Bind(&UserAddingScreenImpl::OnDisplayHostCompletion,
                  base::Unretained(this)));
 
-  g_browser_process->platform_part()->SessionManager()->SetSessionState(
+  session_manager::SessionManager::Get()->SetSessionState(
       session_manager::SessionState::LOGIN_SECONDARY);
   for (auto& observer : observers_)
     observer.OnUserAddingStarted();
 }
 
 void UserAddingScreenImpl::Cancel() {
   CHECK(IsRunning());
 
   // Make sure that system tray is enabled after this flow.
   ash::Shell::GetInstance()->GetPrimarySystemTray()->SetEnabled(true);
@@ skipping 15 matching lines @@
 }
 
 void UserAddingScreenImpl::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void UserAddingScreenImpl::OnDisplayHostCompletion() {
   CHECK(IsRunning());
   display_host_ = NULL;
 
-  g_browser_process->platform_part()->SessionManager()->SetSessionState(
+  session_manager::SessionManager::Get()->SetSessionState(
       session_manager::SessionState::ACTIVE);
   for (auto& observer : observers_)
     observer.OnUserAddingFinished();
 }
 
 // static
 UserAddingScreenImpl* UserAddingScreenImpl::GetInstance() {
   return base::Singleton<UserAddingScreenImpl>::get();
 }
 
 UserAddingScreenImpl::UserAddingScreenImpl()
     : display_host_(NULL), im_controller_(this) {
 }
 
 UserAddingScreenImpl::~UserAddingScreenImpl() {
 }
 
 }  // anonymous namespace
 
 UserAddingScreen::UserAddingScreen() {}
 UserAddingScreen::~UserAddingScreen() {}
 
 UserAddingScreen* UserAddingScreen::Get() {
   return UserAddingScreenImpl::GetInstance();
 }
 
 }  // namespace chromeos