Merge Prevent DisplayPreferences from saving incorrect rotations.

ash/display/display_info_unittest.cc

Index: ash/display/display_info_unittest.cc
diff --git a/ash/display/display_info_unittest.cc b/ash/display/display_info_unittest.cc
index 01362b43ceaa61d679aa39e98548f62593bc6862..7c5da69f402c3c91fdad9306c7acdc75f36a7707 100644
--- a/ash/display/display_info_unittest.cc
+++ b/ash/display/display_info_unittest.cc
@@ -29,32 +29,32 @@ TEST_F(DisplayInfoTest, CreateFromSpec) {
   EXPECT_EQ(10, info.id());
   EXPECT_EQ("0,0 200x100", info.bounds_in_native().ToString());
   EXPECT_EQ("200x100", info.size_in_pixel().ToString());
-  EXPECT_EQ(gfx::Display::ROTATE_0, info.rotation());
+  EXPECT_EQ(gfx::Display::ROTATE_0, info.GetActiveRotation());
   EXPECT_EQ("0,0,0,0", info.overscan_insets_in_dip().ToString());
   EXPECT_EQ(1.0f, info.configured_ui_scale());
 
   info = DisplayInfo::CreateFromSpecWithID("10+20-300x400*2/o", 10);
   EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString());
   EXPECT_EQ("288x380", info.size_in_pixel().ToString());
-  EXPECT_EQ(gfx::Display::ROTATE_0, info.rotation());
+  EXPECT_EQ(gfx::Display::ROTATE_0, info.GetActiveRotation());
   EXPECT_EQ("5,3,5,3", info.overscan_insets_in_dip().ToString());
 
   info = DisplayInfo::CreateFromSpecWithID("10+20-300x400*2/ob", 10);
   EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString());
   EXPECT_EQ("288x380", info.size_in_pixel().ToString());
-  EXPECT_EQ(gfx::Display::ROTATE_0, info.rotation());
+  EXPECT_EQ(gfx::Display::ROTATE_0, info.GetActiveRotation());
   EXPECT_EQ("5,3,5,3", info.overscan_insets_in_dip().ToString());
 
   info = DisplayInfo::CreateFromSpecWithID("10+20-300x400*2/or", 10);
   EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString());
   EXPECT_EQ("380x288", info.size_in_pixel().ToString());
-  EXPECT_EQ(gfx::Display::ROTATE_90, info.rotation());
+  EXPECT_EQ(gfx::Display::ROTATE_90, info.GetActiveRotation());
   // TODO(oshima): This should be rotated too. Fix this.
   EXPECT_EQ("5,3,5,3", info.overscan_insets_in_dip().ToString());
 
   info = DisplayInfo::CreateFromSpecWithID("10+20-300x400*2/l@1.5", 10);
   EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString());
-  EXPECT_EQ(gfx::Display::ROTATE_270, info.rotation());
+  EXPECT_EQ(gfx::Display::ROTATE_270, info.GetActiveRotation());
   EXPECT_EQ(1.5f, info.configured_ui_scale());
 
   info = DisplayInfo::CreateFromSpecWithID(