mash: Move SystemTrayDelegate ownership to WmShell

ash/system/chromeos/tray_display_unittest.cc

 // Copyright 2013 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/system/chromeos/tray_display.h"
 
+#include "ash/common/wm_shell.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/devicetype_utils.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "base/strings/string16.h"
@@ skipping 419 matching lines @@
   UpdateDisplay("400x400@1.5");
   GetTray()->ShowDefaultView(BUBBLE_USE_EXISTING);
 
   // Back to the default state, the display tray item should disappear.
   UpdateDisplay("400x400");
   EXPECT_TRUE(GetTray()->HasSystemBubble());
   EXPECT_FALSE(IsDisplayVisibleInTray());
 }
 
 TEST_F(TrayDisplayTest, DisplayNotifications) {
   test::TestSystemTrayDelegate* tray_delegate =

[msw, 2016/06/10 18:48:21]

nit: AshTestBase::GetSystemTrayDelegate here and twice more below.

[James Cook, 2016/06/10 20:20:32]

Done.

       static_cast<test::TestSystemTrayDelegate*>(
-          Shell::GetInstance()->system_tray_delegate());
+          WmShell::Get()->system_tray_delegate());
   tray_delegate->set_should_show_display_notification(true);
 
   UpdateDisplay("400x400");
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   display::Display::SetInternalDisplayId(display_manager->first_display_id());
   EXPECT_TRUE(GetDisplayNotificationText().empty());
 
   // rotation.
   UpdateDisplay("400x400/r");
   EXPECT_EQ(l10n_util::GetStringFUTF16(
@@ skipping 90 matching lines @@
             GetDisplayNotificationText());
   EXPECT_EQ(
       ash::SubstituteChromeOSDeviceType(
         IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED_DESCRIPTION),
       GetDisplayNotificationAdditionalText());
 }
 
 TEST_F(TrayDisplayTest, DisplayConfigurationChangedTwice) {
   test::TestSystemTrayDelegate* tray_delegate =
       static_cast<test::TestSystemTrayDelegate*>(
-          Shell::GetInstance()->system_tray_delegate());
+          WmShell::Get()->system_tray_delegate());
   tray_delegate->set_should_show_display_notification(true);
 
   UpdateDisplay("400x400,200x200");
   EXPECT_EQ(
       l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED_NO_INTERNAL),
       GetDisplayNotificationText());
 
   // OnDisplayConfigurationChanged() may be called more than once for a single
   // update display in case of primary is swapped or recovered from dock mode.
   // Should not remove the notification in such case.
   GetTrayDisplay()->OnDisplayConfigurationChanged();
   EXPECT_EQ(
       l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED_NO_INTERNAL),
       GetDisplayNotificationText());
 
   // Back to the single display. It SHOULD remove the notification since the
   // information is stale.
   UpdateDisplay("400x400");
   EXPECT_TRUE(GetDisplayNotificationText().empty());
 }
 
 TEST_F(TrayDisplayTest, UpdateAfterSuppressDisplayNotification) {
   UpdateDisplay("400x400,200x200");
 
   test::TestSystemTrayDelegate* tray_delegate =
       static_cast<test::TestSystemTrayDelegate*>(
-          Shell::GetInstance()->system_tray_delegate());
+          WmShell::Get()->system_tray_delegate());
   tray_delegate->set_should_show_display_notification(true);
 
   // rotate the second.
   UpdateDisplay("400x400,200x200/r");
   EXPECT_EQ(l10n_util::GetStringFUTF16(
                 IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED, GetSecondDisplayName(),
                 l10n_util::GetStringUTF16(
                     IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90)),
             GetDisplayNotificationAdditionalText());
 }
@@ skipping 27 matching lines @@
       display::Display::ROTATION_SOURCE_ACCELEROMETER);
   EXPECT_FALSE(IsDisplayVisibleInTray());
 
   // If a non-rotation setting is changed, display regardless of the source of
   // rotation so that the full message is shown.
   UpdateDisplay("400x400@1.5");
   EXPECT_TRUE(IsDisplayVisibleInTray());
 }
 
 }  // namespace ash