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

ash/test/ui_controls_factory_ash.cc

Index: ash/test/ui_controls_factory_ash.cc
diff --git a/ash/test/ui_controls_factory_ash.cc b/ash/test/ui_controls_factory_ash.cc
index af690d08e43ff2c3a92cbcc3a741c8618786058d..66562bfeb14eff123ff3efc82c0723b66f3970a2 100644
--- a/ash/test/ui_controls_factory_ash.cc
+++ b/ash/test/ui_controls_factory_ash.cc
@@ -15,7 +15,7 @@
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/test/ui_controls.h"
 #include "ui/base/test/ui_controls_aura.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*)
 
@@ -99,7 +99,7 @@ class UIControlsAsh : public UIControlsAura {
   }
 
   bool SendMouseEvents(MouseButton type, int state) override {
-    gfx::Point p(gfx::Screen::GetScreen()->GetCursorScreenPoint());
+    gfx::Point p(display::Screen::GetScreen()->GetCursorScreenPoint());
     UIControlsAura* ui_controls = GetUIControlsAt(p);
     return ui_controls && ui_controls->SendMouseEvents(type, state);
   }
@@ -114,7 +114,7 @@ class UIControlsAsh : public UIControlsAura {
   }
 
   bool SendMouseClick(MouseButton type) override {
-    gfx::Point p(gfx::Screen::GetScreen()->GetCursorScreenPoint());
+    gfx::Point p(display::Screen::GetScreen()->GetCursorScreenPoint());
     UIControlsAura* ui_controls = GetUIControlsAt(p);
     return ui_controls && ui_controls->SendMouseClick(type);
   }