Relocate display_manager from ash to ui

ash/display/extended_mouse_warp_controller_unittest.cc

 // 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.
 
 #include "ash/display/extended_mouse_warp_controller.h"
 
-#include "ash/display/display_manager.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/test/display_manager_test_api.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/display/manager/display_layout_builder.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
+#include "ui/display/test/display_manager_test_api.h"
 #include "ui/events/test/event_generator.h"
 
 namespace ash {
 
 class ExtendedMouseWarpControllerTest : public test::AshTestBase {
  public:
   ExtendedMouseWarpControllerTest() {}
   ~ExtendedMouseWarpControllerTest() override {}
 
  protected:
@@ skipping 29 matching lines @@
 
   UpdateDisplay("360x360,700x700");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   int64_t display_0_id = display::Screen::GetScreen()
                              ->GetDisplayNearestWindow(root_windows[0])
                              .id();
   int64_t display_1_id = display::Screen::GetScreen()
                              ->GetDisplayNearestWindow(root_windows[1])
                              .id();
 
-  std::unique_ptr<display::DisplayLayout> layout(test::CreateDisplayLayout(
-      display_manager(), display::DisplayPlacement::RIGHT, 0));
+  std::unique_ptr<display::DisplayLayout> layout(
+      display::test::CreateDisplayLayout(display_manager(),
+                                         display::DisplayPlacement::RIGHT, 0));
 
   display_manager()->SetLayoutForCurrentDisplays(layout->Copy());
   event_filter()->ShowSharedEdgeIndicator(root_windows[0] /* primary */);
 
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(359, 16, 1, 344), GetIndicatorBounds(display_0_id));
   EXPECT_EQ(gfx::Rect(360, 0, 1, 360), GetIndicatorBounds(display_1_id));
 
   event_filter()->ShowSharedEdgeIndicator(root_windows[1] /* secondary */);
   EXPECT_EQ(gfx::Rect(359, 0, 1, 360), GetIndicatorBounds(display_0_id));
@@ skipping 51 matching lines @@
   UpdateDisplay("360x360,700x700");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
   int64_t display_0_id = display::Screen::GetScreen()
                              ->GetDisplayNearestWindow(root_windows[0])
                              .id();
   int64_t display_1_id = display::Screen::GetScreen()
                              ->GetDisplayNearestWindow(root_windows[1])
                              .id();
 
-  std::unique_ptr<display::DisplayLayout> layout(test::CreateDisplayLayout(
-      display_manager(), display::DisplayPlacement::LEFT, 0));
+  std::unique_ptr<display::DisplayLayout> layout(
+      display::test::CreateDisplayLayout(display_manager(),
+                                         display::DisplayPlacement::LEFT, 0));
   display_manager()->SetLayoutForCurrentDisplays(layout->Copy());
 
   event_filter()->ShowSharedEdgeIndicator(root_windows[0] /* primary */);
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(0, 16, 1, 344), GetIndicatorBounds(display_0_id));
   EXPECT_EQ(gfx::Rect(-1, 0, 1, 360), GetIndicatorBounds(display_1_id));
 
   event_filter()->ShowSharedEdgeIndicator(root_windows[1] /* secondary */);
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(0, 0, 1, 360), GetIndicatorBounds(display_0_id));
@@ skipping 20 matching lines @@
 
   UpdateDisplay("360x360,700x700");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   int64_t display_0_id = display::Screen::GetScreen()
                              ->GetDisplayNearestWindow(root_windows[0])
                              .id();
   int64_t display_1_id = display::Screen::GetScreen()
                              ->GetDisplayNearestWindow(root_windows[1])
                              .id();
 
-  std::unique_ptr<display::DisplayLayout> layout(test::CreateDisplayLayout(
-      display_manager(), display::DisplayPlacement::TOP, 0));
+  std::unique_ptr<display::DisplayLayout> layout(
+      display::test::CreateDisplayLayout(display_manager(),
+                                         display::DisplayPlacement::TOP, 0));
   display_manager()->SetLayoutForCurrentDisplays(layout->Copy());
   event_filter()->ShowSharedEdgeIndicator(root_windows[0] /* primary */);
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(0, 0, 360, 1), GetIndicatorBounds(display_0_id));
   EXPECT_EQ(gfx::Rect(0, -1, 360, 1), GetIndicatorBounds(display_1_id));
 
   event_filter()->ShowSharedEdgeIndicator(root_windows[1] /* secondary */);
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(0, 0, 360, 1), GetIndicatorBounds(display_0_id));
   EXPECT_EQ(gfx::Rect(0, -1, 360, 1), GetIndicatorBounds(display_1_id));
@@ skipping 171 matching lines @@
             region_0->GetIndicatorBoundsForTest(display_2_id));
   // between 2 and 1
   EXPECT_EQ(gfx::Rect(900, 499, 200, 1),
             region_1->GetIndicatorBoundsForTest(display_1_id));
   EXPECT_EQ(gfx::Rect(900, 500, 200, 1),
             region_1->GetIndicatorBoundsForTest(display_2_id));
   event_filter()->HideSharedEdgeIndicator();
 }
 
 }  // namespace ash