Rename gfx::Screen::GetMonitorXXXX to gfx::Screen::GetDisplayXXX.

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 7968e529aefa2e4403b39c700d5785443a0b932f..95019a445898311659fc2e867d6cc32c28116345 100644
--- a/ui/aura/test/test_screen.cc
+++ b/ui/aura/test/test_screen.cc
@@ -28,20 +28,20 @@ gfx::NativeWindow TestScreen::GetWindowAtCursorScreenPoint() {
   return root_window_->GetTopWindowContainingPoint(point);
 }
 
-int TestScreen::GetNumMonitors() {
+int TestScreen::GetNumDisplays() {
   return 1;
 }
 
-gfx::Display TestScreen::GetMonitorNearestWindow(
+gfx::Display TestScreen::GetDisplayNearestWindow(
     gfx::NativeWindow window) const {
   return GetMonitor();
 }
 
-gfx::Display TestScreen::GetMonitorNearestPoint(const gfx::Point& point) const {
+gfx::Display TestScreen::GetDisplayNearestPoint(const gfx::Point& point) const {
   return GetMonitor();
 }
 
-gfx::Display TestScreen::GetPrimaryMonitor() const {
+gfx::Display TestScreen::GetPrimaryDisplay() const {
   return GetMonitor();
 }