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

ui/gfx/screen_android.cc

Index: ui/gfx/screen_android.cc
diff --git a/ui/gfx/screen_android.cc b/ui/gfx/screen_android.cc
index 576afab617b780e2df6ce8b91cca23c48c843e48..a2e5a5ddb7aec36dbb0e8095c2749c095f6f29ac 100644
--- a/ui/gfx/screen_android.cc
+++ b/ui/gfx/screen_android.cc
@@ -15,23 +15,22 @@ bool Screen::IsDIPEnabled() {
 }
 
 // static
-gfx::Display Screen::GetPrimaryMonitor() {
+gfx::Display Screen::GetPrimaryDisplay() {
   NOTIMPLEMENTED() << "crbug.com/117839 tracks implementation";
   return gfx::Display(0, gfx::Rect(0, 0, 1, 1));
 }
 
 // static
-gfx::Display Screen::GetMonitorNearestWindow(gfx::NativeView view) {
-  return GetPrimaryMonitor();
+gfx::Display Screen::GetDisplayNearestWindow(gfx::NativeView view) {
+  return GetPrimaryDisplay();
 }
 
 // static
-gfx::Display Screen::GetMonitorNearestPoint(const gfx::Point& point) {
-  return GetPrimaryMonitor();
+gfx::Display Screen::GetDisplayNearestPoint(const gfx::Point& point) {
+  return GetPrimaryDisplay();
 }
 
-// static
-int Screen::GetNumMonitors() {
+int Screen::GetNumDisplays() {
   return 1;
 }