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 d6f2892652cc8d70f292cdd2f414f196f0fe742f..01137fadb4bdc1bb9ee4d9e9b3ceb8a1f68604b2 100644
--- a/ash/display/display_util.cc
+++ b/ash/display/display_util.cc
@@ -9,7 +9,6 @@
 
 #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"
@@ -23,6 +22,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"
@@ -73,7 +73,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>();