mash: Move SystemTrayDelegate ownership to WmShell

ash/accelerators/accelerator_interactive_uitest_chromeos.cc

 // Copyright 2015 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/accelerators/accelerator_controller.h"
 
 #include "ash/common/shell_observer.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
@@ skipping 151 matching lines @@
   EXPECT_EQ(1, screenshot_delegate->handle_take_screenshot_count());
   SendKeyPressSync(ui::VKEY_PRINT, false, false, false);
   EXPECT_EQ(2, screenshot_delegate->handle_take_screenshot_count());
   SendKeyPressSync(ui::VKEY_MEDIA_LAUNCH_APP1, true, true, false);
   EXPECT_EQ(2, screenshot_delegate->handle_take_screenshot_count());
   // Press ESC to go out of the partial screenshot mode.
   SendKeyPressSync(ui::VKEY_ESCAPE, false, false, false);
 
   // Test VOLUME_MUTE, VOLUME_DOWN, and VOLUME_UP.
   TestVolumeControlDelegate* volume_delegate = new TestVolumeControlDelegate;
-  shell()->system_tray_delegate()->SetVolumeControlDelegate(
+  WmShell::Get()->system_tray_delegate()->SetVolumeControlDelegate(
       std::unique_ptr<VolumeControlDelegate>(volume_delegate));
   // VOLUME_MUTE.
   EXPECT_EQ(0, volume_delegate->handle_volume_mute_count());
   SendKeyPressSync(ui::VKEY_VOLUME_MUTE, false, false, false);
   EXPECT_EQ(1, volume_delegate->handle_volume_mute_count());
   // VOLUME_DOWN.
   EXPECT_EQ(0, volume_delegate->handle_volume_down_count());
   SendKeyPressSync(ui::VKEY_VOLUME_DOWN, false, false, false);
   EXPECT_EQ(1, volume_delegate->handle_volume_down_count());
   // VOLUME_UP.
@@ skipping 18 matching lines @@
 TEST_F(AcceleratorInteractiveUITest, MAYBE_ToggleAppList) {
   EXPECT_FALSE(shell()->GetAppListTargetVisibility());
   SendKeyPressSync(ui::VKEY_LWIN, false, false, false);
   EXPECT_TRUE(shell()->GetAppListTargetVisibility());
   SendKeyPressSync(ui::VKEY_LWIN, false, false, false);
   EXPECT_FALSE(shell()->GetAppListTargetVisibility());
 }
 
 }  // namespace test
 }  // namespace ash