Merge Prevent DisplayPreferences from saving incorrect rotations.

ash/wm/lock_layout_manager_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 "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 194 matching lines @@
   // Repro steps for http://crbug.com/401667:
   // 1. Set up login screen defaults: VK override disabled
   // 2. Show/hide keyboard, make sure that no stale keyboard bounds are cached.
   keyboard::SetKeyboardOverscrollOverride(
        keyboard::KEYBOARD_OVERSCROLL_OVERRIDE_DISABLED);
   ShowKeyboard(true);
   ShowKeyboard(false);
   ash::DisplayManager* display_manager =
       Shell::GetInstance()->display_manager();
   display_manager->SetDisplayRotation(primary_display.id(),
-                                      gfx::Display::ROTATE_90);
+                                      gfx::Display::ROTATE_90,
+                                      gfx::Display::ROTATION_SOURCE_ACTIVE);
   primary_display = Shell::GetScreen()->GetPrimaryDisplay();
   screen_bounds = primary_display.bounds();
   EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString());
   display_manager->SetDisplayRotation(primary_display.id(),
-                                      gfx::Display::ROTATE_0);
+                                      gfx::Display::ROTATE_0,
+                                      gfx::Display::ROTATION_SOURCE_ACTIVE);
 
   // When virtual keyboard overscroll is disabled keyboard bounds do
   // affect window bounds.
   keyboard::SetKeyboardOverscrollOverride(
        keyboard::KEYBOARD_OVERSCROLL_OVERRIDE_DISABLED);
   ShowKeyboard(true);
   keyboard::KeyboardController* keyboard =
         keyboard::KeyboardController::GetInstance();
   primary_display = Shell::GetScreen()->GetPrimaryDisplay();
   screen_bounds = primary_display.bounds();
@@ skipping 52 matching lines @@
       ScreenUtil::GetDisplayWorkAreaBoundsInParent(window.get());
   window->SetBounds(work_area);
   // Usually work_area takes Shelf into account but that doesn't affect
   // LockScreen container windows.
   EXPECT_NE(work_area.ToString(), window->GetBoundsInScreen().ToString());
   EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString());
 }
 
 }  // namespace test
 }  // namespace ash