Move even more from WmShell to Shell

ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc

Index: ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
diff --git a/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc b/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
index a902e92167e7ac6825adef902c82ac4d82cee6cc..4c7788b8e6ffc870956cc82967e5a9b44533d5b3 100644
--- a/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
+++ b/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
@@ -119,11 +119,11 @@ TEST_F(TrayRotationLockTest, CreateTrayView) {
 // it is not visible.
 TEST_F(TrayRotationLockTest, CreateTrayViewDuringMaximizeMode) {
   TearDownViews();
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   SetUpForStatusAreaWidget(StatusAreaWidgetTestHelper::GetStatusAreaWidget());
   EXPECT_FALSE(tray_view()->visible());
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
 }
 
@@ -131,13 +131,13 @@ TEST_F(TrayRotationLockTest, CreateTrayViewDuringMaximizeMode) {
 // rotation is locked, that it is visible.
 TEST_F(TrayRotationLockTest, CreateTrayViewDuringMaximizeModeAndRotationLock) {
   TearDownViews();
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   Shell::GetInstance()->screen_orientation_controller()->SetRotationLocked(
       true);
   SetUpForStatusAreaWidget(StatusAreaWidgetTestHelper::GetStatusAreaWidget());
   EXPECT_TRUE(tray_view()->visible());
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
   EXPECT_FALSE(tray_view()->visible());
 }
@@ -146,12 +146,12 @@ TEST_F(TrayRotationLockTest, CreateTrayViewDuringMaximizeModeAndRotationLock) {
 // view, changing the visibility.
 TEST_F(TrayRotationLockTest, TrayViewVisibilityChangesDuringMaximizeMode) {
   ASSERT_FALSE(tray_view()->visible());
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   Shell::GetInstance()->screen_orientation_controller()->SetRotationLocked(
       true);
   EXPECT_TRUE(tray_view()->visible());
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
   EXPECT_FALSE(tray_view()->visible());
 }
@@ -164,10 +164,10 @@ TEST_F(TrayRotationLockTest, CreateSecondaryTrayView) {
   SetUpForStatusAreaWidget(
       StatusAreaWidgetTestHelper::GetSecondaryStatusAreaWidget());
   EXPECT_FALSE(tray_view()->visible());
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   EXPECT_FALSE(tray_view()->visible());
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
   EXPECT_FALSE(tray_view()->visible());
 }
@@ -182,21 +182,21 @@ TEST_F(TrayRotationLockTest, CreateDefaultView) {
 // that it is visible.
 TEST_F(TrayRotationLockTest, CreateDefaultViewDuringMaximizeMode) {
   TearDownViews();
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   SetUpForStatusAreaWidget(StatusAreaWidgetTestHelper::GetStatusAreaWidget());
   EXPECT_TRUE(default_view()->visible());
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
 }
 
 // Tests that the enabling of MaximizeMode affects a previously created default
 // view, changing the visibility.
 TEST_F(TrayRotationLockTest, DefaultViewVisibilityChangesDuringMaximizeMode) {
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   EXPECT_TRUE(default_view()->visible());
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
   EXPECT_FALSE(default_view()->visible());
 }
@@ -216,7 +216,7 @@ TEST_F(TrayRotationLockTest, CreateSecondaryDefaultView) {
 // rotation locked, and that the tray view becomes visible.
 TEST_F(TrayRotationLockTest, PerformActionOnDefaultView) {
   MaximizeModeController* maximize_mode_controller =
-      WmShell::Get()->maximize_mode_controller();
+      Shell::Get()->maximize_mode_controller();
   ScreenOrientationController* screen_orientation_controller =
       Shell::GetInstance()->screen_orientation_controller();
   ASSERT_FALSE(screen_orientation_controller->rotation_locked());
@@ -247,7 +247,7 @@ TEST_F(TrayRotationLockTest, InternalDisplayNotAvailableAtCreation) {
   std::unique_ptr<views::View> default_view(tray->CreateDefaultView(
       StatusAreaWidgetTestHelper::GetUserLoginStatus()));
   EXPECT_TRUE(default_view);
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   EXPECT_TRUE(default_view->visible());
 }
@@ -255,12 +255,12 @@ TEST_F(TrayRotationLockTest, InternalDisplayNotAvailableAtCreation) {
 // Tests that when the tray view is deleted, while TrayRotationLock has not been
 // deleted, that updates to the rotation lock state do not crash.
 TEST_F(TrayRotationLockTest, LockUpdatedDuringDesctruction) {
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   DestroyTrayView();
   Shell::GetInstance()->screen_orientation_controller()->SetRotationLocked(
       true);
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
 }