mash: Move SystemTrayDelegate ownership to WmShell

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/ash_switches.h"
 #include "ash/common/wm/window_positioner.h"
+#include "ash/common/wm_shell.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/ime/input_method_event_handler.h"
 #include "ash/shell.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "base/command_line.h"
@@ skipping 244 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*>(
-      Shell::GetInstance()->system_tray_delegate());
+      WmShell::Get()->system_tray_delegate());
 }
 
 void AshTestBase::SetSessionStarted(bool session_started) {
   AshTestHelper::GetTestSessionStateDelegate()->SetActiveUserSessionStarted(
       session_started);
 }
 
 void AshTestBase::SetSessionStarting() {
   AshTestHelper::GetTestSessionStateDelegate()->set_session_state(
       SessionStateDelegate::SESSION_STATE_ACTIVE);
@@ skipping 49 matching lines @@
 
 void AshTestBase::DisableIME() {
   Shell::GetInstance()->RemovePreTargetHandler(
       Shell::GetInstance()
           ->window_tree_host_manager()
           ->input_method_event_handler());
 }
 
 }  // namespace test
 }  // namespace ash