Merge Prevent DisplayPreferences from saving incorrect rotations.

ash/test/ash_test_base.cc

 // Copyright (c) 2012 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 "ash/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 184 matching lines @@
 }
 
 ui::test::EventGenerator& AshTestBase::GetEventGenerator() {
   if (!event_generator_) {
     event_generator_.reset(
         new ui::test::EventGenerator(new AshEventGeneratorDelegate()));
   }
   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();
 }
 
 bool AshTestBase::SupportsHostWindowResize() {
   return AshTestHelper::SupportsHostWindowResize();
 }
 
 void AshTestBase::UpdateDisplay(const std::string& display_specs) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
@@ skipping 131 matching lines @@
 
 void AshTestBase::UnblockUserSession() {
   Shell::GetInstance()->session_state_delegate()->UnlockScreen();
   SetSessionStarted(true);
   SetUserAddingScreenRunning(false);
 }
 
 
 }  // namespace test
 }  // namespace ash