Remove MouseWarpController construction from ash::DisplayManager

ash/display/mouse_cursor_event_filter.cc

Index: ash/display/mouse_cursor_event_filter.cc
diff --git a/ash/display/mouse_cursor_event_filter.cc b/ash/display/mouse_cursor_event_filter.cc
index d335288871fd571b8690f4f75d73cc9de4580d49..7a45947904474cce58a26cbd7ea63d6fcfcf3af0 100644
--- a/ash/display/mouse_cursor_event_filter.cc
+++ b/ash/display/mouse_cursor_event_filter.cc
@@ -7,8 +7,10 @@
 #include <cmath>
 
 #include "ash/display/cursor_window_controller.h"
-#include "ash/display/display_manager.h"
+//#include "ash/display/display_manager.h"
+#include "ash/display/display_util.h"
 #include "ash/display/mouse_warp_controller.h"
+
 #include "ash/shell.h"
 #include "ui/events/event.h"
 
@@ -23,8 +25,8 @@ MouseCursorEventFilter::~MouseCursorEventFilter() {
 }
 
 void MouseCursorEventFilter::ShowSharedEdgeIndicator(aura::Window* from) {
-  mouse_warp_controller_ =
-      Shell::GetInstance()->display_manager()->CreateMouseWarpController(from);
+  mouse_warp_controller_ = ash::CreateMouseWarpController(
+      Shell::GetInstance()->display_manager(), from);
 }
 
 void MouseCursorEventFilter::HideSharedEdgeIndicator() {
@@ -36,9 +38,8 @@ void MouseCursorEventFilter::OnDisplaysInitialized() {
 }
 
 void MouseCursorEventFilter::OnDisplayConfigurationChanged() {
-  mouse_warp_controller_ =
-      Shell::GetInstance()->display_manager()->CreateMouseWarpController(
-          nullptr);
+  mouse_warp_controller_ = ash::CreateMouseWarpController(
+      Shell::GetInstance()->display_manager(), nullptr);
 }
 
 void MouseCursorEventFilter::OnMouseEvent(ui::MouseEvent* event) {