Move yet more from WmShell to Shell

ash/test/ash_test_base.cc

 // Copyright (c) 2012 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/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/common/session/session_controller.h"
@@ skipping 321 matching lines @@
   GetSessionControllerClient()->SetSessionState(
       user_adding_screen_running
           ? session_manager::SessionState::LOGIN_SECONDARY
           : session_manager::SessionState::ACTIVE);
 }
 
 void AshTestBase::BlockUserSession(UserSessionBlockReason block_reason) {
   switch (block_reason) {
     case BLOCKED_BY_LOCK_SCREEN:
       SetSessionStarted(true);
-      WmShell::Get()->session_controller()->LockScreenAndFlushForTest();
+      Shell::Get()->session_controller()->LockScreenAndFlushForTest();
       Shell::GetInstance()->OnLockStateChanged(true);
       break;
     case BLOCKED_BY_LOGIN_SCREEN:
       SetSessionStarted(false);
       break;
     case BLOCKED_BY_USER_ADDING_SCREEN:
       SetUserAddingScreenRunning(true);
       break;
     default:
       NOTREACHED();
@@ skipping 47 matching lines @@
   Shell::GetInstance()->window_tree_host_manager()->SetPrimaryDisplayId(
       display_manager()->GetSecondaryDisplay().id());
 }
 
 display::Display AshTestBase::GetSecondaryDisplay() {
   return ash_test_helper_->GetSecondaryDisplay();
 }
 
 }  // namespace test
 }  // namespace ash