Moves WindowSelectorController onto WmShell

ash/system/overview/overview_button_tray_unittest.cc

 // Copyright 2014 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/overview/overview_button_tray.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_shell.h"
@@ skipping 80 matching lines @@
       EnableMaximizeModeWindowManager(true);
   EXPECT_TRUE(GetTray()->visible());
 
   Shell::GetInstance()->maximize_mode_controller()->
       EnableMaximizeModeWindowManager(false);
   EXPECT_FALSE(GetTray()->visible());
 }
 
 // Tests that activating this control brings up window selection mode.
 TEST_F(OverviewButtonTrayTest, PerformAction) {
-  ASSERT_FALSE(Shell::GetInstance()->window_selector_controller()->
-      IsSelecting());
+  ASSERT_FALSE(WmShell::Get()->window_selector_controller()->IsSelecting());
 
   // Overview Mode only works when there is a window
   std::unique_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   GetTray()->PerformAction(tap);
-  EXPECT_TRUE(Shell::GetInstance()->window_selector_controller()->
-      IsSelecting());
+  EXPECT_TRUE(WmShell::Get()->window_selector_controller()->IsSelecting());
 }
 
 // Tests that tapping on the control will record the user action Tray_Overview.
 TEST_F(OverviewButtonTrayTest, TrayOverviewUserAction) {
-  ASSERT_FALSE(
-      Shell::GetInstance()->window_selector_controller()->IsSelecting());
+  ASSERT_FALSE(WmShell::Get()->window_selector_controller()->IsSelecting());
 
   // Tapping on the control when there are no windows (and thus the user cannot
   // enter overview mode) should still record the action.
   base::UserActionTester user_action_tester;
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   GetTray()->PerformAction(tap);
-  ASSERT_FALSE(
-      Shell::GetInstance()->window_selector_controller()->IsSelecting());
+  ASSERT_FALSE(WmShell::Get()->window_selector_controller()->IsSelecting());
   EXPECT_EQ(1, user_action_tester.GetActionCount(kTrayOverview));
 
   // With one window present, tapping on the control to enter overview mode
   // should record the user action.
   std::unique_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
   GetTray()->PerformAction(tap);
-  ASSERT_TRUE(
-      Shell::GetInstance()->window_selector_controller()->IsSelecting());
+  ASSERT_TRUE(WmShell::Get()->window_selector_controller()->IsSelecting());
   EXPECT_EQ(2, user_action_tester.GetActionCount(kTrayOverview));
 
   // Tapping on the control to exit overview mode should record the
   // user action.
   GetTray()->PerformAction(tap);
-  ASSERT_FALSE(
-      Shell::GetInstance()->window_selector_controller()->IsSelecting());
+  ASSERT_FALSE(WmShell::Get()->window_selector_controller()->IsSelecting());
   EXPECT_EQ(3, user_action_tester.GetActionCount(kTrayOverview));
 }
 
 // Tests that a second OverviewButtonTray has been created, and only shows
 // when MaximizeMode has been enabled,  when we are using multiple displays.
 // By default the DisplayManger is in extended mode.
 TEST_F(OverviewButtonTrayTest, DisplaysOnBothDisplays) {
   if (!SupportsMultipleDisplays())
     return;
 
@@ skipping 41 matching lines @@
   SetUserAddingScreenRunning(false);
   NotifySessionStateChanged();
   EXPECT_TRUE(GetTray()->visible());
   Shell::GetInstance()->maximize_mode_controller()->
       EnableMaximizeModeWindowManager(false);
 }
 
 // Tests that the tray only renders as active while selection is ongoing. Any
 // dismissal of overview mode clears the active state.
 TEST_F(OverviewButtonTrayTest, ActiveStateOnlyDuringOverviewMode) {
-  ASSERT_FALSE(
-      Shell::GetInstance()->window_selector_controller()->IsSelecting());
+  ASSERT_FALSE(WmShell::Get()->window_selector_controller()->IsSelecting());
   ASSERT_FALSE(GetTray()->draw_background_as_active());
 
   // Overview Mode only works when there is a window
   std::unique_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   GetTray()->PerformAction(tap);
-  EXPECT_TRUE(
-      Shell::GetInstance()->window_selector_controller()->IsSelecting());
+  EXPECT_TRUE(WmShell::Get()->window_selector_controller()->IsSelecting());
   EXPECT_TRUE(GetTray()->draw_background_as_active());
 
-  Shell::GetInstance()->window_selector_controller()->OnSelectionEnded();
-  EXPECT_FALSE(
-      Shell::GetInstance()->window_selector_controller()->IsSelecting());
+  WmShell::Get()->window_selector_controller()->OnSelectionEnded();
+  EXPECT_FALSE(WmShell::Get()->window_selector_controller()->IsSelecting());
   EXPECT_FALSE(GetTray()->draw_background_as_active());
 }
 
 // Test that when a hide animation is aborted via deletion, that the
 // OverviewButton is still hidden.
 #if defined(OS_WIN) && !defined(USE_ASH)
 // TODO(msw): Broken on Windows. http://crbug.com/584038
 #define MAYBE_HideAnimationAlwaysCompletes DISABLED_HideAnimationAlwaysCompletes
 #else
 #define MAYBE_HideAnimationAlwaysCompletes HideAnimationAlwaysCompletes
@@ skipping 40 matching lines @@
       ->maximize_mode_controller()
       ->EnableMaximizeModeWindowManager(true);
   EXPECT_TRUE(GetTray()->visible());
   Shell::GetInstance()
       ->maximize_mode_controller()
       ->EnableMaximizeModeWindowManager(false);
   EXPECT_FALSE(GetTray()->visible());
 }
 
 }  // namespace ash