Merge Prevent DisplayPreferences from saving incorrect rotations.

ash/test/ash_test_base.h

Index: ash/test/ash_test_base.h
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index e877eec5e9698aedfb5fb1555338e6f0b28a3d8b..bc59cbc9fb390633e75a9f0dca12ebfe43fd12be 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -13,6 +13,7 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/display.h"
 #include "ui/wm/public/window_types.h"
 
 #if defined(OS_WIN)
@@ -99,6 +100,12 @@ class AshTestBase : public testing::Test {
     NUMBER_OF_BLOCK_REASONS
   };
 
+  // Returns the rotation currentl active for the display |id|.
+  static gfx::Display::Rotation GetActiveDisplayRotation(int64 id);
+
+  // Returns the rotation currently active for the internal display.
+  static gfx::Display::Rotation GetCurrentInternalDisplayRotation();
+
   // Proxy to AshTestHelper::SupportsMultipleDisplays().
   static bool SupportsMultipleDisplays();