Move yet more from WmShell to Shell

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"
 #include "ash/common/session/session_controller.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "components/session_manager/session_manager_types.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_type.h"
 
 namespace ash {
 namespace test {
 
 namespace {
@@ skipping 49 matching lines @@
   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.
-  WmShell::Get()->UpdateAfterLoginStatusChange(
+  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();
@@ skipping 80 matching lines @@
   if (it == sessions.end()) {
     NOTREACHED();
     return;
   }
 
   SwitchActiveUser((*it)->account_id);
 }
 
 }  // namespace test
 }  // namespace ash