Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

ash/display/display_util.h

Index: ash/display/display_util.h
diff --git a/ash/display/display_util.h b/ash/display/display_util.h
index fc331cb97d8aeaa6b01bf16220c03e0ad187aa2c..7c1a5b781f9f37cce7bd8bff58bdf35c714758d3 100644
--- a/ash/display/display_util.h
+++ b/ash/display/display_util.h
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "ash/display/display_layout.h"
+#include "ui/display/manager/display_layout.h"
 
 namespace gfx {
 class Display;
@@ -89,7 +89,7 @@ ASH_EXPORT int FindDisplayIndexContainingPoint(
     const gfx::Point& point_in_screen);
 
 // Sorts id list using |CompareDisplayIds| below.
-ASH_EXPORT void SortDisplayIdList(DisplayIdList* list);
+ASH_EXPORT void SortDisplayIdList(display::DisplayIdList* list);
 
 // Default id generator.
 class DefaultDisplayIdGenerator {
@@ -97,12 +97,13 @@ class DefaultDisplayIdGenerator {
   int64_t operator()(int64_t id) { return id; }
 };
 
-// Generate sorted DisplayIdList from iterators.
+// Generate sorted display::DisplayIdList from iterators.
 template <class ForwardIterator, class Generator = DefaultDisplayIdGenerator>
-DisplayIdList GenerateDisplayIdList(ForwardIterator first,
-                                    ForwardIterator last,
-                                    Generator generator = Generator()) {
-  DisplayIdList list;
+display::DisplayIdList GenerateDisplayIdList(
+    ForwardIterator first,
+    ForwardIterator last,
+    Generator generator = Generator()) {
+  display::DisplayIdList list;
   while (first != last) {
     list.push_back(generator(*first));
     ++first;
@@ -111,10 +112,12 @@ DisplayIdList GenerateDisplayIdList(ForwardIterator first,
   return list;
 }
 
-// Creates sorted DisplayIdList.
-ASH_EXPORT DisplayIdList CreateDisplayIdList(const DisplayList& list);
+// Creates sorted display::DisplayIdList.
+ASH_EXPORT display::DisplayIdList CreateDisplayIdList(
+    const display::DisplayList& list);
 
-ASH_EXPORT std::string DisplayIdListToString(const DisplayIdList& list);
+ASH_EXPORT std::string DisplayIdListToString(
+    const display::DisplayIdList& list);
 
 // Returns true if one of following conditinos is met.
 // 1) id1 is internal.