Promotes more accessors from WmShell to Shell

ash/common/system/chromeos/ime_menu/ime_menu_tray_unittest.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/system/chromeos/ime_menu/ime_menu_tray.h"
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/system/chromeos/ime_menu/ime_list_view.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/system/tray/ime_info.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/test/test_system_tray_delegate.h"
-#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/ime/chromeos/mock_input_method_manager.h"
 #include "ui/base/ime/ime_bridge.h"
 #include "ui/base/ime/text_input_flags.h"
 #include "ui/events/event.h"
@@ skipping 65 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ImeMenuTrayTest);
 };
 
 // Tests that visibility of IME menu tray should be consistent with the
 // activation of the IME menu.
 TEST_F(ImeMenuTrayTest, ImeMenuTrayVisibility) {
   ASSERT_FALSE(IsVisible());
 
-  WmShell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
+  Shell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
   EXPECT_TRUE(IsVisible());
 
-  WmShell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(false);
+  Shell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(false);
   EXPECT_FALSE(IsVisible());
 }
 
 // Tests that IME menu tray shows the right info of the current IME.
 TEST_F(ImeMenuTrayTest, TrayLabelTest) {
-  WmShell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
+  Shell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
   ASSERT_TRUE(IsVisible());
 
   // Changes the input method to "ime1".
   IMEInfo info1;
   info1.id = "ime1";
   info1.name = UTF8ToUTF16("English");
   info1.medium_name = UTF8ToUTF16("English");
   info1.short_name = UTF8ToUTF16("US");
   info1.third_party = false;
   info1.selected = true;
   GetSystemTrayDelegate()->SetCurrentIME(info1);
-  WmShell::Get()->system_tray_notifier()->NotifyRefreshIME();
+  Shell::Get()->system_tray_notifier()->NotifyRefreshIME();
   EXPECT_EQ(UTF8ToUTF16("US"), GetTrayText());
 
   // Changes the input method to a third-party IME extension.
   IMEInfo info2;
   info2.id = "ime2";
   info2.name = UTF8ToUTF16("English UK");
   info2.medium_name = UTF8ToUTF16("English UK");
   info2.short_name = UTF8ToUTF16("UK");
   info2.third_party = true;
   info2.selected = true;
   GetSystemTrayDelegate()->SetCurrentIME(info2);
-  WmShell::Get()->system_tray_notifier()->NotifyRefreshIME();
+  Shell::Get()->system_tray_notifier()->NotifyRefreshIME();
   EXPECT_EQ(UTF8ToUTF16("UK*"), GetTrayText());
 }
 
 // Tests that IME menu tray changes background color when tapped/clicked. And
 // tests that the background color becomes 'inactive' when disabling the IME
 // menu feature.
 TEST_F(ImeMenuTrayTest, PerformAction) {
-  WmShell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
+  Shell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
   ASSERT_TRUE(IsVisible());
   ASSERT_FALSE(IsTrayBackgroundActive());
 
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   GetTray()->PerformAction(tap);
   EXPECT_TRUE(IsTrayBackgroundActive());
   EXPECT_TRUE(IsBubbleShown());
 
   GetTray()->PerformAction(tap);
   EXPECT_FALSE(IsTrayBackgroundActive());
   EXPECT_FALSE(IsBubbleShown());
 
   // If disabling the IME menu feature when the menu tray is activated, the tray
   // element will be deactivated.
   GetTray()->PerformAction(tap);
   EXPECT_TRUE(IsTrayBackgroundActive());
-  WmShell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(false);
+  Shell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(false);
   EXPECT_FALSE(IsVisible());
   EXPECT_FALSE(IsBubbleShown());
   EXPECT_FALSE(IsTrayBackgroundActive());
 }
 
 // Tests that IME menu list updates when changing the current IME. This should
 // only happen by using shortcuts (Ctrl + Space / Ctrl + Shift + Space) to
 // switch IMEs.
 TEST_F(ImeMenuTrayTest, RefreshImeWithListViewCreated) {
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
@@ skipping 22 matching lines @@
   info3.name = UTF8ToUTF16("Pinyin");
   info3.medium_name = UTF8ToUTF16("Chinese Pinyin");
   info3.short_name = UTF8ToUTF16("拼");
   info3.third_party = false;
   info3.selected = false;
 
   std::vector<IMEInfo> ime_info_list{info1, info2, info3};
 
   GetSystemTrayDelegate()->SetAvailableIMEList(ime_info_list);
   GetSystemTrayDelegate()->SetCurrentIME(info1);
-  WmShell::Get()->system_tray_notifier()->NotifyRefreshIME();
+  Shell::Get()->system_tray_notifier()->NotifyRefreshIME();
   EXPECT_EQ(UTF8ToUTF16("US"), GetTrayText());
   EXPECT_TRUE(IsTrayImeListValid(ime_info_list, info1));
 
   ime_info_list[0].selected = false;
   ime_info_list[2].selected = true;
   GetSystemTrayDelegate()->SetAvailableIMEList(ime_info_list);
   GetSystemTrayDelegate()->SetCurrentIME(info3);
-  WmShell::Get()->system_tray_notifier()->NotifyRefreshIME();
+  Shell::Get()->system_tray_notifier()->NotifyRefreshIME();
   EXPECT_EQ(UTF8ToUTF16("拼"), GetTrayText());
   EXPECT_TRUE(IsTrayImeListValid(ime_info_list, info3));
 
   // Closes the menu before quitting.
   GetTray()->PerformAction(tap);
   EXPECT_FALSE(IsTrayBackgroundActive());
   EXPECT_FALSE(IsBubbleShown());
 }
 
 // Tests that quits Chrome with IME menu openned will not crash.
 TEST_F(ImeMenuTrayTest, QuitChromeWithMenuOpen) {
-  WmShell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
+  Shell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
   ASSERT_TRUE(IsVisible());
   ASSERT_FALSE(IsTrayBackgroundActive());
 
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   GetTray()->PerformAction(tap);
   EXPECT_TRUE(IsTrayBackgroundActive());
   EXPECT_TRUE(IsBubbleShown());
 }
 
 // Tests using 'Alt+Shift+K' to open the menu.
 TEST_F(ImeMenuTrayTest, TestAccelerator) {
-  WmShell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
+  Shell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
   ASSERT_TRUE(IsVisible());
   ASSERT_FALSE(IsTrayBackgroundActive());
 
   Shell::Get()->accelerator_controller()->PerformActionIfEnabled(
       SHOW_IME_MENU_BUBBLE);
   EXPECT_TRUE(IsTrayBackgroundActive());
   EXPECT_TRUE(IsBubbleShown());
 
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   GetTray()->PerformAction(tap);
   EXPECT_FALSE(IsTrayBackgroundActive());
   EXPECT_FALSE(IsBubbleShown());
 }
 
 TEST_F(ImeMenuTrayTest, ShowEmojiKeyset) {
-  WmShell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
+  Shell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
   ASSERT_TRUE(IsVisible());
   ASSERT_FALSE(IsTrayBackgroundActive());
 
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   GetTray()->PerformAction(tap);
   EXPECT_TRUE(IsTrayBackgroundActive());
   EXPECT_TRUE(IsBubbleShown());
 
   AccessibilityDelegate* accessibility_delegate =
@@ skipping 42 matching lines @@
   input_method_manager = chromeos::input_method::InputMethodManager::Get();
   EXPECT_TRUE(input_method_manager &&
               input_method_manager->IsEmojiHandwritingVoiceOnImeMenuEnabled());
   EXPECT_TRUE(GetTray()->ShouldShowEmojiHandwritingVoiceButtons());
 
   FocusInInputContext(ui::TEXT_INPUT_TYPE_PASSWORD);
   EXPECT_FALSE(GetTray()->ShouldShowEmojiHandwritingVoiceButtons());
 }
 
 }  // namespace ash