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

chrome/browser/ui/views/ash/window_positioner_unittest.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 "chrome/browser/ui/views/ash/window_positioner.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
@@ skipping 176 matching lines @@
   panel_.reset(NULL);
 
   AshTestBase::TearDown();
   delete window_positioner_;
   window_positioner_ = NULL;
 }
 
 } // namespace
 
 TEST_F(WindowPositionerTest, cascading) {
-  const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitorWorkArea();
+  const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().work_area();
 
   // First see that the window will cascade down when there is no space.
   window()->SetBounds(work_area);
   window()->Show();
 
   gfx::Rect popup_position(0, 0, 200, 200);
   // Check that it gets cascaded.
   gfx::Rect cascade_1 = window_positioner()->GetPopupPosition(popup_position);
   EXPECT_EQ(gfx::Rect(work_area.x() + grid_size_, work_area.y() + grid_size_,
                       popup_position.width(), popup_position.height()),
@@ skipping 39 matching lines @@
                                 (2 * grid_size_ - work_area.y()));
   gfx::Rect cascade_5 =
       window_positioner()->GetPopupPosition(popup_position_5);
   EXPECT_EQ(gfx::Rect(work_area.x() + grid_size_,
                       work_area.y() + grid_size_,
                       popup_position_5.width(), popup_position_5.height()),
                       cascade_5);
 }
 
 TEST_F(WindowPositionerTest, filling) {
-  const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitorWorkArea();
+  const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().work_area();
   int grid = ash::Shell::GetInstance()->GetGridSize();
   gfx::Rect popup_position(0, 0, 256, 128);
   // Leave space on the left and the right and see if we fill top to bottom.
   window()->SetBounds(gfx::Rect(work_area.x() + popup_position.width(),
                                 work_area.y(),
                                 work_area.width() - 2 * popup_position.width(),
                                 work_area.height()));
   window()->Show();
   // Check that we are positioned in the top left corner.
   gfx::Rect top_left = window_positioner()->GetPopupPosition(popup_position);
@@ skipping 34 matching lines @@
   gfx::Rect top_right = window_positioner()->GetPopupPosition(
                             popup_position);
   EXPECT_EQ(gfx::Rect(ash::WindowResizer::AlignToGridRoundDown(
                          work_area.right() - popup_position.width(), grid),
                       work_area.y(),
                       popup_position.width(), popup_position.height()),
                       top_right);
 }
 
 TEST_F(WindowPositionerTest, blockedByPanel) {
-  const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitorWorkArea();
+  const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().work_area();
 
   gfx::Rect pop_position(0, 0, 200, 200);
   // Let the panel cover everything.
   panel()->SetBounds(work_area);
   panel()->Show();
 
   // Check that the popup does cascade due to the panel's existence.
   gfx::Rect top_right = window_positioner()->GetPopupPosition(pop_position);
   EXPECT_EQ(gfx::Rect(work_area.x() + grid_size_, work_area.y() + grid_size_,
                       pop_position.width(), pop_position.height()),
                       top_right);
 }
 
 TEST_F(WindowPositionerTest, biggerThenBorder) {
-  const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitorWorkArea();
+  const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().work_area();
 
   gfx::Rect pop_position(0, 0, work_area.width(), work_area.height());
 
   // Check that the popup is placed full screen.
   gfx::Rect full = window_positioner()->GetPopupPosition(pop_position);
   EXPECT_EQ(gfx::Rect(work_area.x(), work_area.y(),
                       pop_position.width(), pop_position.height()),
                       full);
 }
 
 }  // namespace test
 }  // namespace ash