Relocate display_manager from ash to ui

ash/display/extended_mouse_warp_controller.h

Index: ash/display/extended_mouse_warp_controller.h
diff --git a/ash/display/extended_mouse_warp_controller.h b/ash/display/extended_mouse_warp_controller.h
index 64f6ac756344f67eaf0030b72633ec2c0016b262..eba9cd859ff91084c47a5639470f4c64f0067ec6 100644
--- a/ash/display/extended_mouse_warp_controller.h
+++ b/ash/display/extended_mouse_warp_controller.h
@@ -20,6 +20,9 @@ class Window;
 
 namespace display {
 class Display;
+// namespace test {

[kylechar, 2016/10/24 14:55:15]

Delete?

[rjkroege, 2016/10/25 23:30:26]

Done.

+// class DisplayManagerTestApi;
+//}
 }
 
 namespace gfx {
@@ -29,7 +32,6 @@ class Point;
 namespace ash {
 namespace test {
 class AshTestBase;
-class DisplayManagerTestApi;
 }
 class SharedDisplayEdgeIndicator;
 
@@ -45,7 +47,7 @@ class ASH_EXPORT ExtendedMouseWarpController : public MouseWarpController {
 
  private:
   friend class test::AshTestBase;
-  friend class test::DisplayManagerTestApi;
+  // friend class display::test::DisplayManagerTestApi;

[kylechar, 2016/10/24 14:55:15]

Delete?

[rjkroege, 2016/10/25 23:30:26]

Done.

   friend class ExtendedMouseWarpControllerTest;
   FRIEND_TEST_ALL_PREFIXES(ExtendedMouseWarpControllerTest,
                            IndicatorBoundsTestThreeDisplays);