[Cleanup] Factor out layout store code from DisplayController

ash/display/display_manager_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 "ash/display/display_manager.h"
 
 #include "ash/display/display_controller.h"
+#include "ash/display/display_layout_store.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/mirror_window_test_api.h"
 #include "base/format_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
@@ skipping 622 matching lines @@
   // The mouse pointer is outside and closest display is 1st one.
   UpdateDisplay("300x280,200x200");
   EXPECT_EQ("150,140", env->last_mouse_location().ToString());
 }
 
 TEST_F(DisplayManagerTest, EnsurePointerInDisplays_2ndOnLeft) {
   if (!SupportsMultipleDisplays())
     return;
 
   // Set the 2nd display on the left.
-  DisplayController* display_controller =
-      Shell::GetInstance()->display_controller();
-  DisplayLayout layout = display_controller->default_display_layout();
+  DisplayLayoutStore* layout_store =
+      Shell::GetInstance()->display_manager()->layout_store();
+  DisplayLayout layout = layout_store->default_display_layout();
   layout.position = DisplayLayout::LEFT;
-  display_controller->SetDefaultDisplayLayout(layout);
+  layout_store->SetDefaultDisplayLayout(layout);
 
   UpdateDisplay("200x200,300x300");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   EXPECT_EQ("-300,0 300x300",
             ScreenAsh::GetSecondaryDisplay().bounds().ToString());
 
   aura::Env* env = aura::Env::GetInstance();
 
   // Set the initial position.
@@ skipping 309 matching lines @@
   UpdateDisplay("400x600/o,600x800/o");
   EXPECT_FALSE(display_observer.changed_and_reset());
   EXPECT_EQ("400x600", test_api.GetRootWindow()->bounds().size().ToString());
   EXPECT_EQ("600x800", GetMirroredDisplay().size().ToString());
 
   Shell::GetScreen()->RemoveObserver(&display_observer);
 }
 
 }  // namespace internal
 }  // namespace ash