Move gfx::Display/Screen to display::Display/Screen in aura/events

ui/aura/test/test_screen.h

Index: ui/aura/test/test_screen.h
diff --git a/ui/aura/test/test_screen.h b/ui/aura/test/test_screen.h
index 03cb4107e1e5f8404c67a8f62f6fceb8b4da4050..69b0b089d52e6656721716785ebe918d3f787be4 100644
--- a/ui/aura/test/test_screen.h
+++ b/ui/aura/test/test_screen.h
@@ -8,8 +8,8 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/aura/window_observer.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 
 namespace gfx {
 class Insets;
@@ -21,20 +21,19 @@ namespace aura {
 class Window;
 class WindowTreeHost;
 
-// A minimal, testing Aura implementation of gfx::Screen.
+// A minimal, testing Aura implementation of display::Screen.
 // TODO(bruthig): Consider extending gfx::test::TestScreen.
-class TestScreen : public gfx::Screen,
-                   public WindowObserver {
+class TestScreen : public display::Screen, public WindowObserver {
  public:
-  // Creates a gfx::Screen of the specified size. If no size is specified, then
-  // creates a 800x600 screen. |size| is in physical pixels.
+  // Creates a display::Screen of the specified size. If no size is specified,
+  // then creates a 800x600 screen. |size| is in physical pixels.
   static TestScreen* Create(const gfx::Size& size);
   ~TestScreen() override;
 
   WindowTreeHost* CreateHostForPrimaryDisplay();
 
   void SetDeviceScaleFactor(float device_scale_fator);
-  void SetDisplayRotation(gfx::Display::Rotation rotation);
+  void SetDisplayRotation(display::Display::Rotation rotation);
   void SetUIScale(float ui_scale);
   void SetWorkAreaInsets(const gfx::Insets& insets);
 
@@ -48,25 +47,27 @@ class TestScreen : public gfx::Screen,
                              const gfx::Rect& new_bounds) override;
   void OnWindowDestroying(Window* window) override;
 
-  // gfx::Screen overrides:
+  // display::Screen overrides:
   gfx::Point GetCursorScreenPoint() override;
   gfx::NativeWindow GetWindowUnderCursor() override;
   gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
   int GetNumDisplays() const override;
-  std::vector<gfx::Display> GetAllDisplays() const override;
-  gfx::Display GetDisplayNearestWindow(gfx::NativeView view) const override;
-  gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const override;
-  gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const override;
-  gfx::Display GetPrimaryDisplay() const override;
-  void AddObserver(gfx::DisplayObserver* observer) override;
-  void RemoveObserver(gfx::DisplayObserver* observer) override;
+  std::vector<display::Display> GetAllDisplays() const override;
+  display::Display GetDisplayNearestWindow(gfx::NativeView view) const override;
+  display::Display GetDisplayNearestPoint(
+      const gfx::Point& point) const override;
+  display::Display GetDisplayMatching(
+      const gfx::Rect& match_rect) const override;
+  display::Display GetPrimaryDisplay() const override;
+  void AddObserver(display::DisplayObserver* observer) override;
+  void RemoveObserver(display::DisplayObserver* observer) override;
 
  private:
   explicit TestScreen(const gfx::Rect& screen_bounds);
 
   aura::WindowTreeHost* host_;
 
-  gfx::Display display_;
+  display::Display display_;
 
   float ui_scale_;