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

chrome/browser/ui/panels/panel_browsertest.cc

Index: chrome/browser/ui/panels/panel_browsertest.cc
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index f29b25498d6990cb2932033a5a5982a1a0c9862a..65114d3b0f70f30ba45a561b00ea0980c78755cd 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -44,6 +44,7 @@
 #include "content/test/net/url_request_mock_http_job.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/monitor.h"
 #include "ui/gfx/screen.h"
 
 using content::BrowserThread;
@@ -1642,7 +1643,7 @@ class PanelAndNotificationTest : public PanelBrowserTest {
     // The position returned by the notification balloon is based on Mac's
     // vertically inverted orientation. We need to flip it so that it can
     // be compared against the position returned by the panel.
-    gfx::Size screen_size = gfx::Screen::GetPrimaryMonitorSize();
+    gfx::Size screen_size = gfx::Screen::GetPrimaryMonitor()->GetSize();
     return screen_size.height() - balloon->GetPosition().y();
 #else
     return balloon->GetPosition().y() + balloon->GetViewSize().height();