Move Screen Rotation from MaximizeModeController to ScreenOrientationController

ash/system/chromeos/rotation/tray_rotation_lock_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/chromeos/rotation/tray_rotation_lock.h"
 
 #include "ash/ash_switches.h"
+#include "ash/content/display/screen_orientation_controller_chromeos.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
@@ skipping 28 matching lines @@
   // created. On a secondary display both the tray view and default view will
   // be null.
   void SetUpForStatusAreaWidget(StatusAreaWidget* status_area_widget);
 
   // Resets |tray_| |tray_view_| and |default_view_| so that all components of
   // TrayRotationLock have been cleared. Tests may then call
   // SetUpForStatusAreaWidget in order to initial the components.
   void TearDownViews();
 
   // test::AshTestBase:
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
  private:
   scoped_ptr<TrayRotationLock> tray_;
   scoped_ptr<views::View> tray_view_;
   scoped_ptr<views::View> default_view_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayRotationLockTest);
 };
 
 void TrayRotationLockTest::SetUpForStatusAreaWidget(
@@ skipping 43 matching lines @@
   Shell::GetInstance()->maximize_mode_controller()->
       EnableMaximizeModeWindowManager(false);
 }
 
 // Tests that when the tray view is created, while MaximizeMode is active, and
 // rotation is locked, that it is visible.
 TEST_F(TrayRotationLockTest, CreateTrayViewDuringMaximizeModeAndRotationLock) {
   TearDownViews();
   Shell::GetInstance()->maximize_mode_controller()->
       EnableMaximizeModeWindowManager(true);
-  Shell::GetInstance()-> maximize_mode_controller()->SetRotationLocked(true);
+  Shell::GetInstance()->screen_orientation_controller()->SetRotationLocked(
+      true);
   SetUpForStatusAreaWidget(StatusAreaWidgetTestHelper::GetStatusAreaWidget());
   EXPECT_TRUE(tray_view()->visible());
   Shell::GetInstance()->maximize_mode_controller()->
       EnableMaximizeModeWindowManager(false);
   EXPECT_FALSE(tray_view()->visible());
 }
 
 // Tests that the enabling of MaximizeMode affects a previously created tray
 // view, changing the visibility.
 TEST_F(TrayRotationLockTest, TrayViewVisibilityChangesDuringMaximizeMode) {
   ASSERT_FALSE(tray_view()->visible());
   Shell::GetInstance()->maximize_mode_controller()->
       EnableMaximizeModeWindowManager(true);
-  Shell::GetInstance()->maximize_mode_controller()->SetRotationLocked(true);
+  Shell::GetInstance()->screen_orientation_controller()->SetRotationLocked(
+      true);
   EXPECT_TRUE(tray_view()->visible());
   Shell::GetInstance()->maximize_mode_controller()->
       EnableMaximizeModeWindowManager(false);
   EXPECT_FALSE(tray_view()->visible());
 }
 
 // Tests that the when the tray view is created for a secondary display, that
 // it is not visible, and that MaximizeMode does not affect visibility.
 TEST_F(TrayRotationLockTest, CreateSecondaryTrayView) {
   if (!SupportsMultipleDisplays())
@@ skipping 51 matching lines @@
   SetUpForStatusAreaWidget(
       StatusAreaWidgetTestHelper::GetSecondaryStatusAreaWidget());
   EXPECT_EQ(NULL, default_view());
 }
 
 // Tests that activating the default view causes the display to have its
 // rotation locked, and that the tray view becomes visible.
 TEST_F(TrayRotationLockTest, PerformActionOnDefaultView) {
   MaximizeModeController* maximize_mode_controller = Shell::GetInstance()->
       maximize_mode_controller();
-  ASSERT_FALSE(maximize_mode_controller->rotation_locked());
-  Shell::GetInstance()->maximize_mode_controller()->
-      EnableMaximizeModeWindowManager(true);
+  ScreenOrientationController* screen_orientation_controller =
+      Shell::GetInstance()->screen_orientation_controller();
+  ASSERT_FALSE(screen_orientation_controller->rotation_locked());
+  maximize_mode_controller->EnableMaximizeModeWindowManager(true);
   ASSERT_FALSE(tray_view()->visible());
 
   ui::GestureEvent tap(
       0, 0, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   default_view()->OnGestureEvent(&tap);
-  EXPECT_TRUE(maximize_mode_controller->rotation_locked());
+  EXPECT_TRUE(screen_orientation_controller->rotation_locked());
   EXPECT_TRUE(tray_view()->visible());
 
-  Shell::GetInstance()->maximize_mode_controller()->
-      EnableMaximizeModeWindowManager(false);
+  maximize_mode_controller->EnableMaximizeModeWindowManager(false);
 }
 
 }  // namespace ash