Revert of Merge Prevent DisplayPreferences from saving incorrect rotations.

ash/wm/maximize_mode/maximize_mode_controller_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 <math.h>
 #include <map>
 #include <string>
 
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 
@@ skipping 144 matching lines @@
                 base.y(), base.z());
     update->Set(chromeos::ACCELEROMETER_SOURCE_SCREEN, lid.x(), lid.y(),
                 lid.z());
     maximize_mode_controller()->OnAccelerometerUpdated(update);
   }
 
   bool IsMaximizeModeStarted() {
     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() {
     scoped_ptr<base::TickClock> tick_clock(
         test_tick_clock_ = new base::SimpleTestTickClock());
     test_tick_clock_->Advance(base::TimeDelta::FromSeconds(1));
     maximize_mode_controller()->SetTickClockForTest(tick_clock.Pass());
   }
 
   void AdvanceTickClock(const base::TimeDelta& delta) {
@@ skipping 333 matching lines @@
 // accelerometer updates which would normally cause it to exit do not.
 TEST_F(MaximizeModeControllerSwitchesTest, IgnoreHingeAngles) {
   maximize_mode_controller()->EnableMaximizeModeWindowManager(true);
 
   // Would normally trigger an exit from maximize mode.
   OpenLidToAngle(90.0f);
   EXPECT_TRUE(IsMaximizeModeStarted());
 }
 
 }  // namespace ash