[Cleanup] Factor out layout store code from DisplayController

chrome/browser/chromeos/display/display_preferences_unittest.cc

Index: chrome/browser/chromeos/display/display_preferences_unittest.cc
diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc
index a87a6287a520365391207d19fd482cd8208d997d..82354ca966520c2761e457293d9b8a37277ff48a 100644
--- a/chrome/browser/chromeos/display/display_preferences_unittest.cc
+++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/chromeos/display/display_preferences.h"
 
 #include "ash/display/display_controller.h"
+#include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
@@ -130,7 +131,7 @@ class DisplayPreferencesTest : public ash::test::AshTestBase {
     ash::DisplayIdPair pair;
     pair.first = id1;
     pair.second = id2;
-    return ash::Shell::GetInstance()->display_controller()->
+    return ash::Shell::GetInstance()->display_manager()->layout_store()->
         GetRegisteredDisplayLayout(pair).ToString();
   }