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

ash/dip_unittest.cc

Index: ash/dip_unittest.cc
diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc
index 118350d1ecc945e58c5a46e0ef5ac396a725af8c..a6ebe1442709930078f6ffe57c8fe1fd087c9919 100644
--- a/ash/dip_unittest.cc
+++ b/ash/dip_unittest.cc
@@ -39,7 +39,7 @@ TEST_F(DIPTest, MAYBE_WorkArea) {
   ChangeMonitorConfig(1.0f, gfx::Rect(0, 0, 1000, 900));
 
   aura::RootWindow* root = Shell::GetPrimaryRootWindow();
-  const gfx::Display display = gfx::Screen::GetMonitorNearestWindow(root);
+  const gfx::Display display = gfx::Screen::GetDisplayNearestWindow(root);
 
   EXPECT_EQ("0,0 1000x900", display.bounds().ToString());
   gfx::Rect work_area = display.work_area();
@@ -48,7 +48,7 @@ TEST_F(DIPTest, MAYBE_WorkArea) {
 
   ChangeMonitorConfig(2.0f, gfx::Rect(0, 0, 2000, 1800));
 
-  const gfx::Display display_2x = gfx::Screen::GetMonitorNearestWindow(root);
+  const gfx::Display display_2x = gfx::Screen::GetDisplayNearestWindow(root);
 
   // The |bounds_in_pixel()| should report bounds in pixel coordinate.
   EXPECT_EQ("0,0 2000x1800", display_2x.bounds_in_pixel().ToString());