cros: Use SessionController for lock starting code

ash/session/session_controller.cc

 // Copyright 2016 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 "ash/session/session_controller.h"
 
 #include <algorithm>
 
 #include "ash/session/session_observer.h"
 #include "ash/shell.h"
@@ skipping 23 matching lines @@
 // chrome to update ash for such cases.
 SessionState GetDefaultSessionState() {
   const bool start_with_user =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kLoginUser);
   return start_with_user ? SessionState::ACTIVE : SessionState::UNKNOWN;
 }
 
 }  // namespace
 
-SessionController::SessionController() : state_(GetDefaultSessionState()) {}
+SessionController::SessionController()
+    : state_(GetDefaultSessionState()), weak_ptr_factory_(this) {}
 
-SessionController::~SessionController() {}
+SessionController::~SessionController() {
+  // Abort pending start lock request.
+  if (!start_lock_callback_.is_null())
+    std::move(start_lock_callback_).Run(false /* locked */);
+}
 
 void SessionController::BindRequest(mojom::SessionControllerRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 int SessionController::GetMaximumNumberOfLoggedInUsers() const {
   return session_manager::kMaxmiumNumberOfUserSessions;
 }
 
 int SessionController::NumberOfLoggedInUsers() const {
@@ skipping 146 matching lines @@
   if (user_sessions_[0]->session_id != active_session_id_) {
     active_session_id_ = user_sessions_[0]->session_id;
 
     for (auto& observer : observers_)
       observer.OnActiveUserSessionChanged(user_sessions_[0]->account_id);
 
     UpdateLoginStatus();
   }
 }
 
+void SessionController::StartLock(const StartLockCallback& callback) {
+  DCHECK(start_lock_callback_.is_null());
+  start_lock_callback_ = callback;
+
+  LockStateController* const lock_state_controller =
+      Shell::Get()->lock_state_controller();
+
+  lock_state_controller->SetLockScreenDisplayedCallback(
+      base::Bind(&SessionController::OnLockAnimationFinished,
+                 weak_ptr_factory_.GetWeakPtr()));
+  lock_state_controller->OnStartingLock();
+}
+
 void SessionController::RunUnlockAnimation(
     const RunUnlockAnimationCallback& callback) {
   is_unlocking_ = true;
 
   // Shell could have no instance in tests.
   if (Shell::HasInstance())
     Shell::Get()->lock_state_controller()->OnLockScreenHide(callback);
 }
 
 void SessionController::NotifyChromeTerminating() {
@@ skipping 105 matching lines @@
 void SessionController::UpdateLoginStatus() {
   const LoginStatus new_login_status = CalculateLoginStatus();
   if (new_login_status == login_status_)
     return;
 
   login_status_ = new_login_status;
   for (auto& observer : observers_)
     observer.OnLoginStatusChanged(login_status_);
 }
 
+void SessionController::OnLockAnimationFinished() {
+  if (!start_lock_callback_.is_null())
+    std::move(start_lock_callback_).Run(true /* locked */);
+}
+
 }  // namespace ash