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

ash/touch/touch_observer_hud_unittest.cc

Index: ash/touch/touch_observer_hud_unittest.cc
diff --git a/ash/touch/touch_observer_hud_unittest.cc b/ash/touch/touch_observer_hud_unittest.cc
index 5ff81f0778713757b0f4d908a844e9229e23ae98..d3d2b4e13391e40dcdeb197e0b1c728c10d87f4a 100644
--- a/ash/touch/touch_observer_hud_unittest.cc
+++ b/ash/touch/touch_observer_hud_unittest.cc
@@ -44,11 +44,11 @@ class TouchHudTestBase : public test::AshTestBase {
         CreateDisplayInfo(mirrored_display_id_, gfx::Rect(0, 0, 100, 100));
   }
 
-  gfx::Display GetPrimaryDisplay() {
-    return gfx::Screen::GetScreen()->GetPrimaryDisplay();
+  display::Display GetPrimaryDisplay() {
+    return display::Screen::GetScreen()->GetPrimaryDisplay();
   }
 
-  const gfx::Display& GetSecondaryDisplay() {
+  const display::Display& GetSecondaryDisplay() {
     return ScreenUtil::GetSecondaryDisplay();
   }
 
@@ -127,11 +127,11 @@ class TouchHudTestBase : public test::AshTestBase {
     return Shell::GetInstance()->window_tree_host_manager();
   }
 
-  const gfx::Display& GetInternalDisplay() {
+  const display::Display& GetInternalDisplay() {
     return GetDisplayManager()->GetDisplayForId(internal_display_id_);
   }
 
-  const gfx::Display& GetExternalDisplay() {
+  const display::Display& GetExternalDisplay() {
     return GetDisplayManager()->GetDisplayForId(external_display_id_);
   }
 
@@ -146,12 +146,12 @@ class TouchHudTestBase : public test::AshTestBase {
   }
 
   aura::Window* GetPrimaryRootWindow() {
-    const gfx::Display& display = GetPrimaryDisplay();
+    const display::Display& display = GetPrimaryDisplay();
     return GetWindowTreeHostManager()->GetRootWindowForDisplayId(display.id());
   }
 
   aura::Window* GetSecondaryRootWindow() {
-    const gfx::Display& display = GetSecondaryDisplay();
+    const display::Display& display = GetSecondaryDisplay();
     return GetWindowTreeHostManager()->GetRootWindowForDisplayId(display.id());
   }