Move yet more from WmShell to Shell

ash/mus/test/wm_test_base.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/mus/test/wm_test_base.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/session/session_controller.h"
-#include "ash/common/wm_shell.h"
 #include "ash/mus/test/wm_test_helper.h"
 #include "ash/mus/top_level_window_factory.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
 #include "ash/public/cpp/session_types.h"
 #include "ash/public/interfaces/session_controller.mojom.h"
+#include "ash/shell.h"
 #include "ash/test/wm_window_test_api.h"
 #include "base/memory/ptr_util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/display/display.h"
 
 namespace ash {
@@ skipping 145 matching lines @@
 }
 
 void WmTestBase::TearDown() {
   teardown_called_ = true;
   test_helper_.reset();
   minimum_size_lock_.reset();
   zero_duration_mode_.reset();
 }
 
 void WmTestBase::SimulateUserLogin() {
-  SessionController* session_controller = WmShell::Get()->session_controller();
+  SessionController* session_controller = Shell::Get()->session_controller();
 
   // Simulate the first user logging in.
   mojom::UserSessionPtr session = mojom::UserSession::New();
   session->session_id = 1;
   session->type = user_manager::USER_TYPE_REGULAR;
   const std::string email("ash.user@example.com");
   session->account_id = AccountId::FromUserEmail(email);
   session->display_name = "Ash User";
   session->display_email = email;
   session_controller->UpdateUserSession(std::move(session));
 
   // Simulate the user session becoming active.
   mojom::SessionInfoPtr info = mojom::SessionInfo::New();
   info->can_lock_screen = true;
   info->should_lock_screen_automatically = false;
   info->add_user_session_policy = AddUserSessionPolicy::ALLOWED;
   info->state = session_manager::SessionState::ACTIVE;
   session_controller->SetSessionInfo(std::move(info));
 }
 
 
 }  // namespace mus
 }  // namespace ash