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

ui/gfx/screen_unittest.cc

Index: ui/gfx/screen_unittest.cc
diff --git a/ui/gfx/screen_unittest.cc b/ui/gfx/screen_unittest.cc
index 54066972d13b4a530d00eadeb7aed246751bfa33..fe4c6ea477bfe2733425a92a4decd48a2532ffc8 100644
--- a/ui/gfx/screen_unittest.cc
+++ b/ui/gfx/screen_unittest.cc
@@ -10,16 +10,16 @@ namespace {
 
 typedef testing::Test ScreenTest;
 
-TEST_F(ScreenTest, GetPrimaryMonitorSize) {
+TEST_F(ScreenTest, GetPrimaryDisplaySize) {
   // We aren't actually testing that it's correct, just that it's sane.
-  const gfx::Size size = gfx::Screen::GetPrimaryMonitor().size();
+  const gfx::Size size = gfx::Screen::GetPrimaryDisplay().size();
   EXPECT_GE(size.width(), 1);
   EXPECT_GE(size.height(), 1);
 }
 
-TEST_F(ScreenTest, GetNumMonitors) {
+TEST_F(ScreenTest, GetNumDisplays) {
   // We aren't actually testing that it's correct, just that it's sane.
-  EXPECT_GE(gfx::Screen::GetNumMonitors(), 1);
+  EXPECT_GE(gfx::Screen::GetNumDisplays(), 1);
 }
 
 }  // namespace