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

ash/wm/window_positioner_unittest.cc

Index: ash/wm/window_positioner_unittest.cc
diff --git a/ash/wm/window_positioner_unittest.cc b/ash/wm/window_positioner_unittest.cc
index 02bf201526e9e9003712ff5155551e3f59701624..0f7b217fac4be1cae52c1d8648ba3ec77a2a0404 100644
--- a/ash/wm/window_positioner_unittest.cc
+++ b/ash/wm/window_positioner_unittest.cc
@@ -15,7 +15,7 @@
 #include "ash/wm/window_state_aura.h"
 #include "base/strings/string_number_conversions.h"
 #include "ui/aura/window_event_dispatcher.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
@@ -61,7 +61,7 @@ TEST_F(WindowPositionerTest, OpenDefaultWindowOnSecondDisplay) {
   // The window should be in the 2nd display with the default size.
   EXPECT_EQ("300x300", bounds.size().ToString());
 #endif
-  EXPECT_TRUE(gfx::Screen::GetScreen()
+  EXPECT_TRUE(display::Screen::GetScreen()
                   ->GetDisplayNearestWindow(second_root_window)
                   .bounds()
                   .Contains(bounds));