Merge Prevent DisplayPreferences from saving incorrect rotations.

ash/test/ash_test_base.cc

Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index ef7fba32473c08012caf6a4bcb4a0213b03fda43..153eea5cae6a6e02e1a28e903108152321c357b9 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -202,6 +202,17 @@ ui::test::EventGenerator& AshTestBase::GetEventGenerator() {
   return *event_generator_.get();
 }
 
+gfx::Display::Rotation AshTestBase::GetActiveDisplayRotation(int64 id) {
+  return Shell::GetInstance()
+      ->display_manager()
+      ->GetDisplayInfo(id)
+      .GetActiveRotation();
+}
+
+gfx::Display::Rotation AshTestBase::GetCurrentInternalDisplayRotation() {
+  return GetActiveDisplayRotation(gfx::Display::InternalDisplayId());
+}
+
 bool AshTestBase::SupportsMultipleDisplays() {
   return AshTestHelper::SupportsMultipleDisplays();
 }