Move more from WmShell to Shell

ash/common/test/ash_test.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/common/test/ash_test.h"
 
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/test/ash_test_impl.h"
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
+#include "ash/shell.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer_type.h"
 #include "ui/display/display.h"
 
 namespace ash {
 
 WindowOwner::WindowOwner(WmWindow* window) : window_(window) {}
 
@@ skipping 14 matching lines @@
 }
 
 // static
 SystemTray* AshTest::GetPrimarySystemTray() {
   return GetPrimaryShelf()->GetStatusAreaWidget()->system_tray();
 }
 
 // static
 test::TestSystemTrayDelegate* AshTest::GetSystemTrayDelegate() {
   return static_cast<test::TestSystemTrayDelegate*>(
-      WmShell::Get()->system_tray_delegate());
+      Shell::Get()->system_tray_delegate());
 }
 
 void AshTest::UpdateDisplay(const std::string& display_spec) {
   return test_impl_->UpdateDisplay(display_spec);
 }
 
 std::unique_ptr<WindowOwner> AshTest::CreateTestWindow(const gfx::Rect& bounds,
                                                        ui::wm::WindowType type,
                                                        int shell_window_id) {
   return test_impl_->CreateTestWindow(bounds, type, shell_window_id);
@@ skipping 76 matching lines @@
 
 void AshTest::SetUp() {
   test_impl_->SetUp();
 }
 
 void AshTest::TearDown() {
   test_impl_->TearDown();
 }
 
 }  // namespace ash