Rename gfx::Display/Screen to display::Display/Screen in ash

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_layout_store.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/screen.h"
 #include "ui/events/test/event_generator.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
 
 namespace ash {
 
 class ExtendedMouseWarpControllerTest : public test::AshTestBase {
  public:
   ExtendedMouseWarpControllerTest() {}
   ~ExtendedMouseWarpControllerTest() override {}
 
  protected:
   MouseCursorEventFilter* event_filter() {
@@ skipping 21 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ExtendedMouseWarpControllerTest);
 };
 
 // Verifies if MouseCursorEventFilter's bounds calculation works correctly.
 TEST_F(ExtendedMouseWarpControllerTest, IndicatorBoundsTestOnRight) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("360x360,700x700");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
-  int64_t display_0_id =
-      gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[0]).id();
-  int64_t display_1_id =
-      gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[1]).id();
+  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();
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   std::unique_ptr<display::DisplayLayout> layout(
       test::CreateDisplayLayout(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));
@@ skipping 48 matching lines @@
   event_filter()->HideSharedEdgeIndicator();
 }
 
 TEST_F(ExtendedMouseWarpControllerTest, IndicatorBoundsTestOnLeft) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("360x360,700x700");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
-  int64_t display_0_id =
-      gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[0]).id();
-  int64_t display_1_id =
-      gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[1]).id();
+  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();
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   std::unique_ptr<display::DisplayLayout> layout(
       test::CreateDisplayLayout(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));
@@ skipping 17 matching lines @@
 
   event_filter()->HideSharedEdgeIndicator();
 }
 
 TEST_F(ExtendedMouseWarpControllerTest, IndicatorBoundsTestOnTopBottom) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("360x360,700x700");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
-  int64_t display_0_id =
-      gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[0]).id();
-  int64_t display_1_id =
-      gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[1]).id();
+  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();
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   std::unique_ptr<display::DisplayLayout> layout(
       test::CreateDisplayLayout(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));
 
@@ skipping 30 matching lines @@
   event_filter()->HideSharedEdgeIndicator();
 }
 
 // Verify indicators show up as expected with 3+ displays.
 TEST_F(ExtendedMouseWarpControllerTest, IndicatorBoundsTestThreeDisplays) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("360x360,700x700,1000x1000");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
-  gfx::Screen* screen = gfx::Screen::GetScreen();
+  display::Screen* screen = display::Screen::GetScreen();
   int64_t display_0_id = screen->GetDisplayNearestWindow(root_windows[0]).id();
   int64_t display_1_id = screen->GetDisplayNearestWindow(root_windows[1]).id();
   int64_t display_2_id = screen->GetDisplayNearestWindow(root_windows[2]).id();
 
   // Drag from left most display
   event_filter()->ShowSharedEdgeIndicator(root_windows[0]);
   ASSERT_EQ(2U, GetWarpRegionsCount());
   const ExtendedMouseWarpController::WarpRegion* region_0 = GetWarpRegion(0);
   const ExtendedMouseWarpController::WarpRegion* region_1 = GetWarpRegion(1);
   EXPECT_EQ(gfx::Rect(359, 16, 1, 344),
@@ skipping 35 matching lines @@
   event_filter()->HideSharedEdgeIndicator();
   // TODO(oshima): Add test cases primary swap.
 }
 
 TEST_F(ExtendedMouseWarpControllerTest,
        IndicatorBoundsTestThreeDisplaysWithLayout) {
   if (!SupportsMultipleDisplays())
     return;
   UpdateDisplay("700x500,500x500,1000x1000");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
-  gfx::Screen* screen = gfx::Screen::GetScreen();
+  display::Screen* screen = display::Screen::GetScreen();
   int64_t display_0_id = screen->GetDisplayNearestWindow(root_windows[0]).id();
   int64_t display_1_id = screen->GetDisplayNearestWindow(root_windows[1]).id();
   int64_t display_2_id = screen->GetDisplayNearestWindow(root_windows[2]).id();
 
   // Layout so that all displays touches togter like this:
   //  +-----+---+
   //  |  0  | 1 |
   //  +-+---+--++
   //    |  2   |
   //    +------+
@@ skipping 30 matching lines @@
             region_2->GetIndicatorBoundsForTest(display_1_id));
   event_filter()->HideSharedEdgeIndicator();
 }
 
 TEST_F(ExtendedMouseWarpControllerTest,
        IndicatorBoundsTestThreeDisplaysWithLayout2) {
   if (!SupportsMultipleDisplays())
     return;
   UpdateDisplay("700x500,500x500,1000x1000");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
-  gfx::Screen* screen = gfx::Screen::GetScreen();
+  display::Screen* screen = display::Screen::GetScreen();
   int64_t display_0_id = screen->GetDisplayNearestWindow(root_windows[0]).id();
   int64_t display_1_id = screen->GetDisplayNearestWindow(root_windows[1]).id();
   int64_t display_2_id = screen->GetDisplayNearestWindow(root_windows[2]).id();
 
   // Layout so that 0 and 1 displays are disconnected.
   //  +-----+ +---+
   //  |  0  | |1 |
   //  +-+---+-+++
   //    |  2   |
   //    +------+
@@ skipping 19 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