Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

chrome/browser/chromeos/display/display_preferences.h

Index: chrome/browser/chromeos/display/display_preferences.h
diff --git a/chrome/browser/chromeos/display/display_preferences.h b/chrome/browser/chromeos/display/display_preferences.h
index ec14e96eeb6a0e37225a2687ec1c7fab39435c87..538b020531b400fe609eda2dddeec8243a897283 100644
--- a/chrome/browser/chromeos/display/display_preferences.h
+++ b/chrome/browser/chromeos/display/display_preferences.h
@@ -7,15 +7,11 @@
 
 #include <stdint.h>
 
-#include "ash/display/display_layout.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
+#include "ui/display/manager/display_layout.h"
 
 class PrefRegistrySimple;
 
-namespace ash {
-class DisplayLayout;
-}
-
 namespace gfx {
 class Display;
 class Insets;
@@ -41,8 +37,8 @@ void StoreDisplayRotationPrefs(bool rotation_lock);
 void LoadDisplayPreferences(bool first_run_after_boot);
 
 // Stores the display layout for given display pairs for tests.
-void StoreDisplayLayoutPrefForTest(const ash::DisplayIdList& list,
-                                   const ash::DisplayLayout& layout);
+void StoreDisplayLayoutPrefForTest(const display::DisplayIdList& list,
+                                   const display::DisplayLayout& layout);
 
 // Stores the given |power_state| for tests.
 void StoreDisplayPowerStateForTest(DisplayPowerState power_state);