Move 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/test/test_session_state_delegate.h"
@@ skipping 283 matching lines @@
 void AshTestBase::RunAllPendingInMessageLoop() {
   ash_test_helper_->RunAllPendingInMessageLoop();
 }
 
 TestScreenshotDelegate* AshTestBase::GetScreenshotDelegate() {
   return ash_test_helper_->test_screenshot_delegate();
 }
 
 TestSystemTrayDelegate* AshTestBase::GetSystemTrayDelegate() {
   return static_cast<TestSystemTrayDelegate*>(
-      WmShell::Get()->system_tray_delegate());
+      Shell::Get()->system_tray_delegate());
 }
 
 void AshTestBase::SetSessionStarted(bool session_started) {
   AshTestHelper::GetTestSessionStateDelegate()->SetActiveUserSessionStarted(
       session_started);
 }
 
 void AshTestBase::SetSessionStarting() {
   AshTestHelper::GetTestSessionStateDelegate()->set_session_state(
       session_manager::SessionState::ACTIVE);
@@ skipping 83 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