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

chrome/browser/ui/panels/panel_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/net/url_request_mock_util.h"
@@ skipping 26 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/show_desktop_notification_params.h"
 #include "content/public/common/url_constants.h"
 #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;
 using content::DownloadItem;
 using content::DownloadManager;
 using content::WebContents;
 
 class PanelBrowserTest : public BasePanelBrowserTest {
  public:
   PanelBrowserTest() : BasePanelBrowserTest() {
@@ skipping 1576 matching lines @@
     params.body = ASCIIToUTF16("Text");
     params.direction = WebKit::WebTextDirectionDefault;
     return params;
   }
 
   int GetBalloonBottomPosition(Balloon* balloon) const {
 #if defined(OS_MACOSX)
     // 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();
 #endif
   }
 
   DesktopNotificationService* service() const { return service_.get(); }
   const BalloonCollection::Balloons& balloons() const {
     return balloons_->GetActiveBalloons();
   }
@@ skipping 95 matching lines @@
   // position when tall panel brings up its titlebar.
   CloseWindowAndWait(panel1->browser());
   EXPECT_EQ(balloon_bottom_after_tall_panel_titlebar_up,
             GetBalloonBottomPosition(balloon));
 
   // Closing the remaining tall panel should move the notification balloon back
   // to its original position.
   CloseWindowAndWait(panel2->browser());
   EXPECT_EQ(original_balloon_bottom, GetBalloonBottomPosition(balloon));
 }