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

ash/test/ash_test_base.h

Index: ash/test/ash_test_base.h
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index 4aaccacb95fa89ce842b1613489115bcfd30c069..70318d896c7d75e29f4ce860fa936a5913587473 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -17,7 +17,7 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 #include "ui/wm/public/window_types.h"
 
 #if defined(OS_WIN)
@@ -105,10 +105,10 @@ class AshTestBase : public testing::Test {
   };
 
   // Returns the rotation currentl active for the display |id|.
-  static gfx::Display::Rotation GetActiveDisplayRotation(int64_t id);
+  static display::Display::Rotation GetActiveDisplayRotation(int64_t id);
 
   // Returns the rotation currently active for the internal display.
-  static gfx::Display::Rotation GetCurrentInternalDisplayRotation();
+  static display::Display::Rotation GetCurrentInternalDisplayRotation();
 
   // Proxy to AshTestHelper::SupportsMultipleDisplays().
   static bool SupportsMultipleDisplays();