Move yet more from WmShell to Shell

ash/common/test/test_system_tray_delegate.cc

 // Copyright 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 "ash/common/test/test_system_tray_delegate.h"
 
 #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/time/time.h"
 
 namespace ash {
 namespace test {
 
 namespace {
 
 LoginStatus g_initial_status = LoginStatus::USER;
 
 }  // namespace
 
 TestSystemTrayDelegate::TestSystemTrayDelegate()
     : login_status_(g_initial_status), session_length_limit_set_(false) {}
 
 TestSystemTrayDelegate::~TestSystemTrayDelegate() {}
 
 void TestSystemTrayDelegate::SetLoginStatus(LoginStatus login_status) {
   login_status_ = login_status;
-  WmShell::Get()->UpdateAfterLoginStatusChange(login_status);
+  Shell::Get()->UpdateAfterLoginStatusChange(login_status);
 }
 
 void TestSystemTrayDelegate::SetSessionLengthLimitForTest(
     const base::TimeDelta& new_limit) {
   session_length_limit_ = new_limit;
   session_length_limit_set_ = true;
 }
 
 void TestSystemTrayDelegate::ClearSessionLengthLimit() {
   session_length_limit_set_ = false;
 }
 
 void TestSystemTrayDelegate::SetCurrentIME(const IMEInfo& info) {
   current_ime_ = info;
 }
 
 void TestSystemTrayDelegate::SetAvailableIMEList(const IMEInfoList& list) {
   ime_list_ = list;
 }
 
 LoginStatus TestSystemTrayDelegate::GetUserLoginStatus() const {
   // Initial login status has been changed for testing.
   if (g_initial_status != LoginStatus::USER &&
       g_initial_status == login_status_) {
     return login_status_;
   }
 
   // At new user image screen manager->IsUserLoggedIn() would return true
   // but there's no browser session available yet so use SessionStarted().
-  SessionController* controller = WmShell::Get()->session_controller();
+  SessionController* controller = Shell::Get()->session_controller();
 
   if (!controller->IsActiveUserSessionStarted())
     return LoginStatus::NOT_LOGGED_IN;
   if (controller->IsScreenLocked())
     return LoginStatus::LOCKED;
   return login_status_;
 }
 
 bool TestSystemTrayDelegate::IsUserSupervised() const {
   return login_status_ == LoginStatus::SUPERVISED;
@@ skipping 29 matching lines @@
     : old_status_(g_initial_status) {
   g_initial_status = new_status;
 }
 
 ScopedInitialLoginStatus::~ScopedInitialLoginStatus() {
   g_initial_status = old_status_;
 }
 
 }  // namespace test
 }  // namespace ash