Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

ash/display/json_converter.h

Index: ash/display/json_converter.h
diff --git a/ash/display/json_converter.h b/ash/display/json_converter.h
index 4c88eb0f5fe5ecac537742827d7b23055ed520ae..0125f23ac412a825966c873401c9215bd763fc7a 100644
--- a/ash/display/json_converter.h
+++ b/ash/display/json_converter.h
@@ -11,14 +11,16 @@ namespace base {
 class Value;
 }
 
-namespace ash {
-
+namespace display {
 class DisplayLayout;
+}
+
+namespace ash {
 
 ASH_EXPORT bool JsonToDisplayLayout(const base::Value& value,
-                                    DisplayLayout* layout);
+                                    display::DisplayLayout* layout);
 
-ASH_EXPORT bool DisplayLayoutToJson(const DisplayLayout& layout,
+ASH_EXPORT bool DisplayLayoutToJson(const display::DisplayLayout& layout,
                                     base::Value* value);
 
 }  // namespace ash