Relocate display_manager from ash to ui

chrome/browser/chromeos/display/display_preferences.cc

Index: chrome/browser/chromeos/display/display_preferences.cc
diff --git a/chrome/browser/chromeos/display/display_preferences.cc b/chrome/browser/chromeos/display/display_preferences.cc
index c69704f54e42d2a673d2621d6d3d27f02b461ba9..cdfc37d9d6f92ec220ec44b3f30be7dce502f278 100644
--- a/chrome/browser/chromeos/display/display_preferences.cc
+++ b/chrome/browser/chromeos/display/display_preferences.cc
@@ -6,7 +6,6 @@
 
 #include <stddef.h>
 
-#include "ash/display/display_manager.h"
 #include "ash/display/display_pref_util.h"
 #include "ash/display/json_converter.h"
 #include "ash/shell.h"
@@ -25,6 +24,7 @@
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_layout_store.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/display_manager_utilities.h"
 #include "ui/gfx/geometry/insets.h"
 #include "url/url_canon.h"
@@ -95,7 +95,7 @@ ui::ColorCalibrationProfile StringToColorProfile(const std::string& value) {
   return ui::COLOR_PROFILE_STANDARD;
 }
 
-ash::DisplayManager* GetDisplayManager() {
+display::DisplayManager* GetDisplayManager() {
   return ash::Shell::GetInstance()->display_manager();
 }
 
@@ -230,7 +230,7 @@ void StoreDisplayLayoutPref(const display::DisplayIdList& list,
 }
 
 void StoreCurrentDisplayLayoutPrefs() {
-  ash::DisplayManager* display_manager = GetDisplayManager();
+  display::DisplayManager* display_manager = GetDisplayManager();
   if (!UserCanSaveDisplayPreference() ||
       display_manager->num_connected_displays() < 2) {
     return;
@@ -243,7 +243,7 @@ void StoreCurrentDisplayLayoutPrefs() {
 }
 
 void StoreCurrentDisplayProperties() {
-  ash::DisplayManager* display_manager = GetDisplayManager();
+  display::DisplayManager* display_manager = GetDisplayManager();
   PrefService* local_state = g_browser_process->local_state();
 
   DictionaryPrefUpdate update(local_state, prefs::kDisplayProperties);