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

ash/display/unified_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/unified_mouse_warp_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/events/test/event_generator.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
 class UnifiedMouseWarpControllerTest : public test::AshTestBase {
  public:
   UnifiedMouseWarpControllerTest() {}
   ~UnifiedMouseWarpControllerTest() override {}
 
   void SetUp() override {
@@ skipping 147 matching lines @@
     BoundaryTestBody("400x400*2,0+450-700x400*2", "400x400*2,0+450-700x600*2");
   }
 }
 
 // Verifies if the mouse pointer correctly moves to another display in
 // unified desktop mode.
 TEST_F(UnifiedMouseWarpControllerTest, WarpMouse) {
   if (!SupportsMultipleDisplays())
     return;
   UpdateDisplay("500x500,600+0-500x500");
-  ASSERT_EQ(1, gfx::Screen::GetScreen()->GetNumDisplays());
+  ASSERT_EQ(1, display::Screen::GetScreen()->GetNumDisplays());
 
   EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(10, 10)));
   // Touch the right edge of the first display. Pointer should warp.
   EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(499, 10)));
   EXPECT_EQ("501,10",  // by 2px.
             aura::Env::GetInstance()->last_mouse_location().ToString());
 
   // Touch the left edge of the second display. Pointer should warp.
   EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(600, 10)));
   EXPECT_EQ("498,10",  // by 2px.
             aura::Env::GetInstance()->last_mouse_location().ToString());
   {
     SCOPED_TRACE("1x1 NO WARP");
     NoWarpTestBody();
   }
 
   // With 2X and 1X displays
   UpdateDisplay("500x500*2,600+0-500x500");
-  ASSERT_EQ(1, gfx::Screen::GetScreen()->GetNumDisplays());
+  ASSERT_EQ(1, display::Screen::GetScreen()->GetNumDisplays());
 
   EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(10, 10)));
   // Touch the right edge of the first display. Pointer should warp.
   EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(499, 10)));
   EXPECT_EQ("250,5",  // moved to 501 by 2px, devided by 2 (dsf).
             aura::Env::GetInstance()->last_mouse_location().ToString());
 
   // Touch the left edge of the second display. Pointer should warp.
   EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(600, 10)));
   EXPECT_EQ("249,5",  // moved to 498 by 2px, divided by 2 (dsf).
             aura::Env::GetInstance()->last_mouse_location().ToString());
 
   {
     SCOPED_TRACE("2x1 NO WARP");
     NoWarpTestBody();
   }
 
   // With 1X and 2X displays
   UpdateDisplay("500x500,600+0-500x500*2");
-  ASSERT_EQ(1, gfx::Screen::GetScreen()->GetNumDisplays());
+  ASSERT_EQ(1, display::Screen::GetScreen()->GetNumDisplays());
 
   EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(10, 10)));
   // Touch the right edge of the first display. Pointer should warp.
   EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(499, 10)));
   EXPECT_EQ("501,10",  // by 2px.
             aura::Env::GetInstance()->last_mouse_location().ToString());
 
   // Touch the left edge of the second display. Pointer should warp.
   EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(600, 10)));
   EXPECT_EQ("498,10",  // by 2px.
             aura::Env::GetInstance()->last_mouse_location().ToString());
   {
     SCOPED_TRACE("1x2 NO WARP");
     NoWarpTestBody();
   }
 
   // With two 2X displays
   UpdateDisplay("500x500*2,600+0-500x500*2");
-  ASSERT_EQ(1, gfx::Screen::GetScreen()->GetNumDisplays());
+  ASSERT_EQ(1, display::Screen::GetScreen()->GetNumDisplays());
 
   EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(10, 10)));
   // Touch the right edge of the first display. Pointer should warp.
   EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(499, 10)));
   EXPECT_EQ("250,5",  // by 2px.
             aura::Env::GetInstance()->last_mouse_location().ToString());
 
   // Touch the left edge of the second display. Pointer should warp.
   EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(600, 10)));
   EXPECT_EQ("249,5",  // moved to 498 by 2px, divided by 2 (dsf).
             aura::Env::GetInstance()->last_mouse_location().ToString());
   {
     SCOPED_TRACE("1x2 NO WARP");
     NoWarpTestBody();
   }
 }
 
 }  // namespace aura