Allow storing display preferences per device.

ash/display/display_controller_unittest.cc

Index: ash/display/display_controller_unittest.cc
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc
index 055ca4b3e2bb2cb87411ab32c0b195cfce301f03..b700895bef434a573cda7aa6f3717287ca0018f7 100644
--- a/ash/display/display_controller_unittest.cc
+++ b/ash/display/display_controller_unittest.cc
@@ -52,21 +52,21 @@ TEST_F(DisplayControllerTest, MAYBE_SecondaryDisplayLayout) {
 
   // Layout the secondary display to the bottom of the primary.
   Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
-      internal::DisplayController::BOTTOM);
+      internal::DisplayLayout::BOTTOM);
   EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("0,500 400x400", GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ("5,505 390x390", GetSecondaryDisplay().work_area().ToString());
 
   // Layout the secondary display to the left of the primary.
   Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
-      internal::DisplayController::LEFT);
+      internal::DisplayLayout::LEFT);
   EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("-400,0 400x400", GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ("-395,5 390x390", GetSecondaryDisplay().work_area().ToString());
 
   // Layout the secondary display to the top of the primary.
   Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
-      internal::DisplayController::TOP);
+      internal::DisplayLayout::TOP);
   EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("0,-400 400x400", GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ("5,-395 390x390", GetSecondaryDisplay().work_area().ToString());
@@ -78,7 +78,7 @@ TEST_F(DisplayControllerTest, MAYBE_SecondaryDisplayLayout) {
 // X11 configuration events while waiting for the MapNotify.
 TEST_F(DisplayControllerTest, DISABLED_BoundsUpdated) {
   Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
-      internal::DisplayController::BOTTOM);
+      internal::DisplayLayout::BOTTOM);
   UpdateDisplay("500x500,400x400");
   gfx::Display* secondary_display =
       aura::Env::GetInstance()->display_manager()->GetDisplayAt(1);
@@ -116,7 +116,7 @@ TEST_F(DisplayControllerTest, WarpMouse) {
 
   ash::internal::DisplayController* controller =
       Shell::GetInstance()->display_controller();
-  EXPECT_EQ(internal::DisplayController::RIGHT,
+  EXPECT_EQ(internal::DisplayLayout::RIGHT,
             controller->secondary_display_layout());
 
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
@@ -174,7 +174,7 @@ TEST_F(DisplayControllerTest, WarpMouseDifferentSizeDisplays) {
 
   ash::internal::DisplayController* controller =
       Shell::GetInstance()->display_controller();
-  EXPECT_EQ(internal::DisplayController::RIGHT,
+  EXPECT_EQ(internal::DisplayLayout::RIGHT,
             controller->secondary_display_layout());
 
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();