ash: Merge LoginStatus update code path

ash/common/test/test_session_controller_client.cc

 // Copyright 2017 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/common/test/test_session_controller_client.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/common/login_status.h"
@@ skipping 59 matching lines @@
 void TestSessionControllerClient::SetShouldLockScreenAutomatically(
     bool should_lock) {
   session_info_->should_lock_screen_automatically = should_lock;
   controller_->SetSessionInfo(session_info_->Clone());
 }
 
 void TestSessionControllerClient::SetSessionState(
     session_manager::SessionState state) {
   session_info_->state = state;
   controller_->SetSessionInfo(session_info_->Clone());
-
-  // TODO(xiyuan): Remove after LoginStatus becomes part of SessionController.
-  Shell::Get()->UpdateAfterLoginStatusChange(
-      state == session_manager::SessionState::ACTIVE
-          ? LoginStatus::USER
-          : LoginStatus::NOT_LOGGED_IN);
 }
 
 void TestSessionControllerClient::CreatePredefinedUserSessions(int count) {
   DCHECK_GT(count, 0);
 
   // Resets the controller's state.
   Reset();
 
   // Adds user sessions with numbered emails if more are needed.
   for (int numbered_user_index = 0; numbered_user_index < count;
@@ skipping 77 matching lines @@
   if (it == sessions.end()) {
     NOTREACHED();
     return;
   }
 
   SwitchActiveUser((*it)->account_id);
 }
 
 }  // namespace test
 }  // namespace ash