Store rotation/ui scale to local state.

chrome/browser/chromeos/display/display_preferences_unittest.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 "chrome/browser/chromeos/display/display_preferences.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
@@ skipping 137 matching lines @@
   ASSERT_NE(id1, dummy_id);
 
   StoreDisplayLayoutPrefForSecondary(id2, ash::DisplayLayout::BOTTOM, 20);
   StoreDisplayLayoutPrefForSecondary(dummy_id, ash::DisplayLayout::TOP, -10);
   StoreDefaultLayoutPref(ash::DisplayLayout::LEFT, 50);
   StorePrimaryDisplayId(id2);
   StoreDisplayOverscan(id1, gfx::Insets(10, 10, 10, 10));
   StoreDisplayOverscan(id2, gfx::Insets(20, 20, 20, 20));
 
   LoadDisplayPreferences();
+  ash::Shell::GetInstance()->display_manager()->UpdateDisplays();
+
   // Check if the layout settings are notified to the system properly.
   ash::DisplayController* display_controller =
       ash::Shell::GetInstance()->display_controller();
   gfx::Screen* screen = gfx::Screen::GetNativeScreen();
   EXPECT_EQ(id2, screen->GetPrimaryDisplay().id());
   // Display was swapped, so the layout was inverted.
   EXPECT_EQ("top, -20",
             display_controller->GetCurrentDisplayLayout().ToString());
 
   EXPECT_EQ("bottom, 20", GetRegisteredDisplayLayoutStr(id1, id2));
@@ skipping 10 matching lines @@
   int64 id1 = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id();
   int64 id2 = ash::ScreenAsh::GetSecondaryDisplay().id();
   int64 dummy_id = id2 + 1;
   ASSERT_NE(id1, dummy_id);
 
   StoreDisplayLayoutPrefForPair(id1, id2, ash::DisplayLayout::TOP, 20);
   StoreDisplayLayoutPrefForPair(id1, dummy_id, ash::DisplayLayout::LEFT, 30);
   StoreDefaultLayoutPref(ash::DisplayLayout::LEFT, 50);
 
   LoadDisplayPreferences();
+  ash::Shell::GetInstance()->display_manager()->UpdateDisplays();
   // Check if the layout settings are notified to the system properly.
   // The paired layout overrides old layout.
   ash::DisplayController* display_controller =
       ash::Shell::GetInstance()->display_controller();
   // Inverted one of for specified pair (id1, id2).  Not used for the pair
   // (id1, dummy_id) since dummy_id is not connected right now.
   EXPECT_EQ("top, 20",
             display_controller->GetCurrentDisplayLayout().ToString());
   EXPECT_EQ("top, 20", GetRegisteredDisplayLayoutStr(id1, id2));
   EXPECT_EQ("left, 30", GetRegisteredDisplayLayoutStr(id1, dummy_id));
@@ skipping 173 matching lines @@
   EXPECT_EQ(1.25f, info1.ui_scale());
 
   const ash::internal::DisplayInfo& info_primary =
       display_manager->GetDisplayInfo(new_primary);
   EXPECT_EQ(gfx::Display::ROTATE_90, info_primary.rotation());
   EXPECT_EQ(1.0f, info_primary.ui_scale());
 }
 
 }  // namespace
 }  // namespace chromeos