Rename the remaining usage of Monitor to Display

ash/dip_unittest.cc

Index: ash/dip_unittest.cc
diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc
index a6ebe1442709930078f6ffe57c8fe1fd087c9919..b710e4c4a09d2ceff21d4e5f5a4461d8627fb854 100644
--- a/ash/dip_unittest.cc
+++ b/ash/dip_unittest.cc
@@ -28,7 +28,7 @@ namespace ash {
 typedef ash::test::AshTestBase DIPTest;
 
 #if defined(OS_WIN)
-// Windows/Aura doesn't have DIP support in monitor yet.
+// Windows/Aura doesn't have DIP support in display yet.
 #define MAYBE_WorkArea DISABLED_WorkArea
 #else
 #define MAYBE_WorkArea WorkArea
@@ -36,7 +36,7 @@ typedef ash::test::AshTestBase DIPTest;
 
 // Test if the WM sets correct work area under different density.
 TEST_F(DIPTest, MAYBE_WorkArea) {
-  ChangeMonitorConfig(1.0f, gfx::Rect(0, 0, 1000, 900));
+  ChangeDisplayConfig(1.0f, gfx::Rect(0, 0, 1000, 900));
 
   aura::RootWindow* root = Shell::GetPrimaryRootWindow();
   const gfx::Display display = gfx::Screen::GetDisplayNearestWindow(root);
@@ -46,7 +46,7 @@ TEST_F(DIPTest, MAYBE_WorkArea) {
   EXPECT_EQ("0,0 1000x852", work_area.ToString());
   EXPECT_EQ("0,0,48,0", display.bounds().InsetsFrom(work_area).ToString());
 
-  ChangeMonitorConfig(2.0f, gfx::Rect(0, 0, 2000, 1800));
+  ChangeDisplayConfig(2.0f, gfx::Rect(0, 0, 2000, 1800));
 
   const gfx::Display display_2x = gfx::Screen::GetDisplayNearestWindow(root);