mash: Move SystemTrayDelegate ownership to WmShell

chrome/browser/ui/ash/system_tray_tray_cast_browsertest_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/common/system/tray/system_tray_delegate.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/system/cast/tray_cast.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/test/tray_cast_test_api.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 135 matching lines @@
 };
 
 }  // namespace
 
 namespace chromeos {
 
 // A simple sanity check to make sure that the cast config delegate actually
 // recognizes the cast extension.
 IN_PROC_BROWSER_TEST_F(SystemTrayTrayCastChromeOSTest,
                        CastTraySanityCheckTestExtensionGetsRecognized) {
-  ash::CastConfigDelegate* cast_config_delegate = ash::Shell::GetInstance()
-                                                      ->system_tray_delegate()
-                                                      ->GetCastConfigDelegate();
+  ash::CastConfigDelegate* cast_config_delegate =
+      ash::WmShell::Get()->system_tray_delegate()->GetCastConfigDelegate();
 
   EXPECT_FALSE(cast_config_delegate->HasCastExtension());
   const extensions::Extension* extension = LoadCastTestExtension();
   EXPECT_TRUE(cast_config_delegate->HasCastExtension());
   UninstallExtension(extension->id());
 }
 
 // Verifies that the cast tray is hidden when there is no extension installed.
 IN_PROC_BROWSER_TEST_F(SystemTrayTrayCastChromeOSTest,
                        CastTrayIsHiddenWhenThereIsNoExtension) {
@@ skipping 102 matching lines @@
   ExecuteJavaScript(extension, "addReceiver('test_id', 'name')");
   ash::TrayCast* tray = GetTrayCast(extension);
   EXPECT_TRUE(StartCastWithVerification(extension, tray, "test_id"));
   UninstallExtension(extension->id());
 }
 
 // Verifies that the CastConfigDelegate opens up a tab called "options.html".
 IN_PROC_BROWSER_TEST_F(SystemTrayTrayCastChromeOSTest, CastTrayOpenOptions) {
   const extensions::Extension* extension = LoadCastTestExtension();
 
-  ash::CastConfigDelegate* cast_config_delegate = ash::Shell::GetInstance()
-                                                      ->system_tray_delegate()
-                                                      ->GetCastConfigDelegate();
+  ash::CastConfigDelegate* cast_config_delegate =
+      ash::WmShell::Get()->system_tray_delegate()->GetCastConfigDelegate();
   cast_config_delegate->LaunchCastOptions();
 
   const GURL url =
       browser()->tab_strip_model()->GetActiveWebContents()->GetURL();
   EXPECT_TRUE(base::StringPiece(url.GetContent()).ends_with("options.html"));
 
   UninstallExtension(extension->id());
 }
 
 }  // namespace chromeos