Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

ash/display/display_change_observer_chromeos.cc

Index: ash/display/display_change_observer_chromeos.cc
diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc
index 23f366588be809f13baaba4b48b7f563172655c8..8e92ff084a12eb6fca7b0126ded66cb445856f7c 100644
--- a/ash/display/display_change_observer_chromeos.cc
+++ b/ash/display/display_change_observer_chromeos.cc
@@ -24,6 +24,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/user_activity/user_activity_detector.h"
 #include "ui/compositor/dip_util.h"
+#include "ui/display/manager/display_layout.h"
 #include "ui/display/types/display_mode.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/display/util/display_util.h"
@@ -156,16 +157,16 @@ ui::MultipleDisplayState DisplayChangeObserver::GetStateForDisplayIds(
   UpdateInternalDisplayId(display_states);
   if (display_states.size() == 1)
     return ui::MULTIPLE_DISPLAY_STATE_SINGLE;
-  DisplayIdList list =
+  display::DisplayIdList list =
       GenerateDisplayIdList(display_states.begin(), display_states.end(),
                             [](const ui::DisplaySnapshot* display_state) {
                               return display_state->display_id();
                             });
 
-  const DisplayLayout& layout = Shell::GetInstance()
-                                    ->display_manager()
-                                    ->layout_store()
-                                    ->GetRegisteredDisplayLayout(list);
+  const display::DisplayLayout& layout = Shell::GetInstance()
+                                             ->display_manager()
+                                             ->layout_store()
+                                             ->GetRegisteredDisplayLayout(list);
   return layout.mirrored ? ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR :
                            ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED;
 }