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

ash/test/cursor_manager_test_api.cc

Index: ash/test/cursor_manager_test_api.cc
diff --git a/ash/test/cursor_manager_test_api.cc b/ash/test/cursor_manager_test_api.cc
index dfc43bbcda92d972ffb9fa001ddd77d69ef0393e..30d545a35e40ea0e5899165e0312fc2228020b02 100644
--- a/ash/test/cursor_manager_test_api.cc
+++ b/ash/test/cursor_manager_test_api.cc
@@ -8,7 +8,7 @@
 #include "ash/test/shell_test_api.h"
 #include "ash/wm/ash_native_cursor_manager.h"
 #include "ui/base/cursor/image_cursors.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 #include "ui/wm/core/cursor_manager.h"
 
 namespace ash {
@@ -29,8 +29,8 @@ gfx::NativeCursor CursorManagerTestApi::GetCurrentCursor() const {
   return cursor_manager_->GetCursor();
 }
 
-gfx::Display::Rotation
-CursorManagerTestApi::GetCurrentCursorRotation() const {
+display::Display::Rotation CursorManagerTestApi::GetCurrentCursorRotation()
+    const {
   return ShellTestApi(Shell::GetInstance()).ash_native_cursor_manager()->
       image_cursors_->GetRotation();
 }