Rename gfx::Monitor to gfx::Display

ash/test/ash_test_base.cc

Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 744ada4d66251419398da28978caff0142f77739..ad9066be2111478f6f8061590668e35d9d9528b5 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -14,7 +14,7 @@
 #include "ui/aura/root_window.h"
 #include "ui/base/ime/text_input_test_support.h"
 #include "ui/compositor/layer_animator.h"
-#include "ui/gfx/monitor.h"
+#include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
@@ -57,12 +57,12 @@ void AshTestBase::TearDown() {
 
 void AshTestBase::ChangeMonitorConfig(float scale,
                                       const gfx::Rect& bounds_in_pixel) {
-  gfx::Monitor monitor = gfx::Monitor(gfx::Screen::GetPrimaryMonitor().id());
-  monitor.SetScaleAndBounds(scale, bounds_in_pixel);
-  std::vector<gfx::Monitor> monitors;
-  monitors.push_back(monitor);
+  gfx::Display display = gfx::Display(gfx::Screen::GetPrimaryMonitor().id());
+  display.SetScaleAndBounds(scale, bounds_in_pixel);
+  std::vector<gfx::Display> displays;
+  displays.push_back(display);
   aura::Env::GetInstance()->monitor_manager()->OnNativeMonitorsChanged(
-      monitors);
+      displays);
 }
 
 void AshTestBase::RunAllPendingInMessageLoop() {