Merge Prevent DisplayPreferences from saving incorrect rotations.

ash/wm/maximize_mode/maximize_mode_controller_unittest.cc

Index: ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
index d4096f492c3fa55ed9d093b0c969d78acea4ccc8..847e71a27d05ebed204ebc1ff33b561932163b2a 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
+++ b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
@@ -162,16 +162,6 @@ class MaximizeModeControllerTest : public test::AshTestBase {
     return maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled();
   }
 
-  gfx::Display::Rotation GetInternalDisplayRotation() const {
-    return Shell::GetInstance()->display_manager()->GetDisplayInfo(
-        gfx::Display::InternalDisplayId()).rotation();
-  }
-
-  void SetInternalDisplayRotation(gfx::Display::Rotation rotation) const {
-    Shell::GetInstance()->display_manager()->
-        SetDisplayRotation(gfx::Display::InternalDisplayId(), rotation);
-  }
-
   // Attaches a SimpleTestTickClock to the MaximizeModeController with a non
   // null value initial value.
   void AttachTickClockForTest() {