Refactor screen/monitor so that gfx::Screen returns monitor object.

ash/wm/root_window_event_filter_unittest.cc

Index: ash/wm/root_window_event_filter_unittest.cc
diff --git a/ash/wm/root_window_event_filter_unittest.cc b/ash/wm/root_window_event_filter_unittest.cc
index 136554cfc83b5c01995a74ab93156b4c9c07921d..812726a8cc101a629b0169d97588cc9da3fcff62 100644
--- a/ash/wm/root_window_event_filter_unittest.cc
+++ b/ash/wm/root_window_event_filter_unittest.cc
@@ -440,8 +440,9 @@ TEST_F(RootWindowEventFilterTest, MAYBE_TransformActivate) {
 
   aura::RootWindow* root_window = Shell::GetRootWindow();
   gfx::Size size = root_window->bounds().size();
-  EXPECT_EQ(gfx::Rect(size),
-            gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point()));
+  EXPECT_EQ(
+      gfx::Rect(size).ToString(),
+      gfx::Screen::GetMonitorNearestPoint(gfx::Point()).bounds().ToString());
 
   // Rotate it clock-wise 90 degrees.
   ui::Transform transform;