Allow storing display preferences per device.

ash/extended_desktop_unittest.cc

Index: ash/extended_desktop_unittest.cc
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index 572bb68982580a6ded93d081942c416e9c647935..a276b0b0b79d3e1f68d8bcebc9de5d61226896e6 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -243,7 +243,7 @@ TEST_F(ExtendedDesktopTest, CycleWindows) {
 TEST_F(ExtendedDesktopTest, GetRootWindowAt) {
   UpdateDisplay("700x500,500x500");
   Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
-      internal::DisplayController::LEFT);
+      internal::DisplayLayout::LEFT);
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   EXPECT_EQ(root_windows[1], wm::GetRootWindowAt(gfx::Point(-400, 100)));
@@ -262,7 +262,7 @@ TEST_F(ExtendedDesktopTest, GetRootWindowAt) {
 TEST_F(ExtendedDesktopTest, GetRootWindowMatching) {
   UpdateDisplay("700x500,500x500");
   Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
-      internal::DisplayController::LEFT);
+      internal::DisplayLayout::LEFT);
 
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
@@ -505,7 +505,7 @@ TEST_F(ExtendedDesktopTest, ConvertPoint) {
 
   // Move the 2nd display to the bottom and test again.
   Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
-      internal::DisplayController::BOTTOM);
+      internal::DisplayLayout::BOTTOM);
 
   display_2 = GetDisplayManager()->FindDisplayForRootWindow(root_windows[1]);
   EXPECT_EQ("0,600", display_2.bounds().origin().ToString());