Relocate display_manager from ash to ui

ash/display/extended_mouse_warp_controller.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H
 #define ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H
 
 #include "ash/display/mouse_warp_controller.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace aura {
 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 {
 class Point;
 }
 
 namespace ash {
 namespace test {
 class AshTestBase;
-class DisplayManagerTestApi;
 }
 class SharedDisplayEdgeIndicator;
 
 // A MouseWarpController used in extended display mode.
 class ASH_EXPORT ExtendedMouseWarpController : public MouseWarpController {
  public:
   explicit ExtendedMouseWarpController(aura::Window* drag_source);
   ~ExtendedMouseWarpController() override;
 
   // MouseWarpController:
   bool WarpMouseCursor(ui::MouseEvent* event) override;
   void SetEnabled(bool enable) override;
 
  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);
   FRIEND_TEST_ALL_PREFIXES(ExtendedMouseWarpControllerTest,
                            IndicatorBoundsTestThreeDisplaysWithLayout);
   FRIEND_TEST_ALL_PREFIXES(ExtendedMouseWarpControllerTest,
                            IndicatorBoundsTestThreeDisplaysWithLayout2);
 
   // Defined in header file because tests need access.
   class ASH_EXPORT WarpRegion {
@@ skipping 67 matching lines @@
   bool enabled_;
 
   bool allow_non_native_event_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtendedMouseWarpController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H