Rename gfx::Monitor to gfx::Display

ui/aura/test/test_screen.cc

Index: ui/aura/test/test_screen.cc
diff --git a/ui/aura/test/test_screen.cc b/ui/aura/test/test_screen.cc
index d242d78e57742ae36c23b6395c30a9c86930ec36..7968e529aefa2e4403b39c700d5785443a0b932f 100644
--- a/ui/aura/test/test_screen.cc
+++ b/ui/aura/test/test_screen.cc
@@ -32,21 +32,21 @@ int TestScreen::GetNumMonitors() {
   return 1;
 }
 
-gfx::Monitor TestScreen::GetMonitorNearestWindow(
+gfx::Display TestScreen::GetMonitorNearestWindow(
     gfx::NativeWindow window) const {
   return GetMonitor();
 }
 
-gfx::Monitor TestScreen::GetMonitorNearestPoint(const gfx::Point& point) const {
+gfx::Display TestScreen::GetMonitorNearestPoint(const gfx::Point& point) const {
   return GetMonitor();
 }
 
-gfx::Monitor TestScreen::GetPrimaryMonitor() const {
+gfx::Display TestScreen::GetPrimaryMonitor() const {
   return GetMonitor();
 }
 
-gfx::Monitor TestScreen::GetMonitor() const {
-  return gfx::Monitor(0, root_window_->bounds());
+gfx::Display TestScreen::GetMonitor() const {
+  return gfx::Display(0, root_window_->bounds());
 }
 
 }  // namespace aura