Rename gfx::Screen::GetMonitorXXXX to gfx::Screen::GetDisplayXXX.

chrome/browser/ui/views/ash/window_positioner_unittest.cc

Index: chrome/browser/ui/views/ash/window_positioner_unittest.cc
diff --git a/chrome/browser/ui/views/ash/window_positioner_unittest.cc b/chrome/browser/ui/views/ash/window_positioner_unittest.cc
index 65ad94e7fe289fac414befb2fb9d0c58b9570d37..737c3dbcb62251c30a88731494d21c9c3da310d5 100644
--- a/chrome/browser/ui/views/ash/window_positioner_unittest.cc
+++ b/chrome/browser/ui/views/ash/window_positioner_unittest.cc
@@ -12,8 +12,8 @@
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/test_browser_window.h"
+#include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/render_view_test.h"
 #include "content/public/test/test_browser_thread.h"
@@ -194,7 +194,7 @@ void WindowPositionerTest::TearDown() {
 } // namespace
 
 TEST_F(WindowPositionerTest, cascading) {
-  const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().work_area();
+  const gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay().work_area();
 
   // First see that the window will cascade down when there is no space.
   window()->SetBounds(work_area);
@@ -254,7 +254,7 @@ TEST_F(WindowPositionerTest, cascading) {
 }
 
 TEST_F(WindowPositionerTest, filling) {
-  const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().work_area();
+  const gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay().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.
@@ -309,7 +309,7 @@ TEST_F(WindowPositionerTest, filling) {
 }
 
 TEST_F(WindowPositionerTest, blockedByPanel) {
-  const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().work_area();
+  const gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay().work_area();
 
   gfx::Rect pop_position(0, 0, 200, 200);
   // Let the panel cover everything.
@@ -324,7 +324,7 @@ TEST_F(WindowPositionerTest, blockedByPanel) {
 }
 
 TEST_F(WindowPositionerTest, biggerThenBorder) {
-  const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().work_area();
+  const gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay().work_area();
 
   gfx::Rect pop_position(0, 0, work_area.width(), work_area.height());