Rename gfx::Monitor to gfx::Display

ui/aura/test/test_screen.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/test/test_screen.h"
 
 #include "base/logging.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/native_widget_types.h"
@@ skipping 14 matching lines @@
 
 gfx::NativeWindow TestScreen::GetWindowAtCursorScreenPoint() {
   const gfx::Point point = gfx::Screen::GetCursorScreenPoint();
   return root_window_->GetTopWindowContainingPoint(point);
 }
 
 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