Relocate display_manager from ash to ui

ash/display/display_util.cc

Index: ash/display/display_util.cc
diff --git a/ash/display/display_util.cc b/ash/display/display_util.cc
index d61349bc368f6cbe6cab8fa3d1faf96390874445..c058899f0f07575e479f705b54acf92d3ab8fedc 100644
--- a/ash/display/display_util.cc
+++ b/ash/display/display_util.cc
@@ -9,12 +9,9 @@
 #include "ash/common/new_window_delegate.h"
 #include "ash/common/system/system_notifier.h"
 #include "ash/common/wm_shell.h"
-#include "ash/display/display_manager.h"
-
 #include "ash/display/extended_mouse_warp_controller.h"
 #include "ash/display/null_mouse_warp_controller.h"
 #include "ash/display/unified_mouse_warp_controller.h"
-
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/shell.h"
 #include "base/strings/string_number_conversions.h"
@@ -24,6 +21,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
@@ -74,7 +72,7 @@ void ConvertPointFromScreenToNative(aura::WindowTreeHost* host,
 }  // namespace
 
 std::unique_ptr<MouseWarpController> CreateMouseWarpController(
-    DisplayManager* manager,
+    display::DisplayManager* manager,
     aura::Window* drag_source) {
   if (manager->IsInUnifiedMode() && manager->num_connected_displays() >= 2)
     return base::MakeUnique<UnifiedMouseWarpController>();