Remove now-unnecessary wrappers around gfx::Screen::GetScreen()

ash/display/screen_position_controller_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 "ash/display/screen_position_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 96 matching lines @@
   EXPECT_EQ("200x200",
             root_windows[0]->GetHost()->GetBounds().size().ToString());
   EXPECT_EQ("100,500",
             root_windows[1]->GetHost()->GetBounds().origin().ToString());
   EXPECT_EQ("200x200",
             root_windows[1]->GetHost()->GetBounds().size().ToString());
 
   const gfx::Point window_pos(100, 100);
   window_->SetBoundsInScreen(
       gfx::Rect(window_pos, gfx::Size(100, 100)),
-      Shell::GetScreen()->GetDisplayNearestPoint(window_pos));
+      gfx::Screen::GetScreen()->GetDisplayNearestPoint(window_pos));
   SetSecondaryDisplayLayout(DisplayLayout::RIGHT);
   // The point is on the primary root window.
   EXPECT_EQ("50,50", ConvertHostPointToScreen(50, 50));
   // The point is out of the all root windows.
   EXPECT_EQ("250,250", ConvertHostPointToScreen(250, 250));
   // The point is on the secondary display.
   EXPECT_EQ("250,0", ConvertHostPointToScreen(50, 400));
 
   SetSecondaryDisplayLayout(DisplayLayout::BOTTOM);
   // The point is on the primary root window.
@@ skipping 17 matching lines @@
   // The point is out of the all root windows.
   EXPECT_EQ("250,250", ConvertHostPointToScreen(250, 250));
   // The point is on the secondary display.
   EXPECT_EQ("50,-200", ConvertHostPointToScreen(50, 400));
 
 
   SetSecondaryDisplayLayout(DisplayLayout::RIGHT);
   const gfx::Point window_pos2(300, 100);
   window_->SetBoundsInScreen(
       gfx::Rect(window_pos2, gfx::Size(100, 100)),
-      Shell::GetScreen()->GetDisplayNearestPoint(window_pos2));
+      gfx::Screen::GetScreen()->GetDisplayNearestPoint(window_pos2));
   // The point is on the secondary display.
   EXPECT_EQ("250,50", ConvertHostPointToScreen(50, 50));
   // The point is out of the all root windows.
   EXPECT_EQ("450,250", ConvertHostPointToScreen(250, 250));
   // The point is on the primary root window.
   EXPECT_EQ("50,0", ConvertHostPointToScreen(50, -400));
 
   SetSecondaryDisplayLayout(DisplayLayout::BOTTOM);
   // The point is on the secondary display.
   EXPECT_EQ("50,250", ConvertHostPointToScreen(50, 50));
@@ skipping 24 matching lines @@
 
   aura::Window::Windows root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   EXPECT_EQ("50,50 200x200",
             root_windows[0]->GetHost()->GetBounds().ToString());
   EXPECT_EQ("50,300 300x300",
             root_windows[1]->GetHost()->GetBounds().ToString());
 
   // Put |window_| to the primary 2x display.
   window_->SetBoundsInScreen(gfx::Rect(20, 20, 50, 50),
-                             Shell::GetScreen()->GetPrimaryDisplay());
+                             gfx::Screen::GetScreen()->GetPrimaryDisplay());
   // (30, 30) means the host coordinate, so the point is still on the primary
   // root window.  Since it's 2x, the specified native point was halved.
   EXPECT_EQ("15,15", ConvertHostPointToScreen(30, 30));
   // Similar to above but the point is out of the all root windows.
   EXPECT_EQ("200,200", ConvertHostPointToScreen(400, 400));
   // Similar to above but the point is on the secondary display.
   EXPECT_EQ("100,15", ConvertHostPointToScreen(200, 30));
 
   // On secondary display. The position on the 2nd host window is (150,200)
   // so the screen position is (100,0) + (150,200).
   EXPECT_EQ("250,200", ConvertHostPointToScreen(150, 450));
 
   // At the edge but still in the primary display.  Remaining of the primary
   // display is (50, 50) but adding ~100 since it's 2x-display.
   EXPECT_EQ("79,79", ConvertHostPointToScreen(158, 158));
   // At the edge of the secondary display.
   EXPECT_EQ("80,80", ConvertHostPointToScreen(160, 160));
 }
 
 TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenRotate) {
   // 1st display is rotated 90 clockise, and 2nd display is rotated
   // 270 clockwise.
   UpdateDisplay("100+100-200x200/r,100+500-200x200/l");
   // Put |window_| to the 1st.
   window_->SetBoundsInScreen(gfx::Rect(20, 20, 50, 50),
-                             Shell::GetScreen()->GetPrimaryDisplay());
+                             gfx::Screen::GetScreen()->GetPrimaryDisplay());
 
   // The point is on the 1st host.
   EXPECT_EQ("70,149", ConvertHostPointToScreen(50, 70));
   // The point is out of the host windows.
   EXPECT_EQ("250,-51", ConvertHostPointToScreen(250, 250));
   // The point is on the 2nd host. Point on 2nd host (30,150) -
   // rotate 270 clockwise -> (149, 30) - layout [+(200,0)] -> (349,30).
   EXPECT_EQ("349,30", ConvertHostPointToScreen(30, 450));
 
   // Move |window_| to the 2nd.
@@ skipping 11 matching lines @@
   // The point is on the 2nd host. Point on 2nd host (50,50) -
   // rotate 90 clockwise -> (50, 149)
   EXPECT_EQ("50,149", ConvertHostPointToScreen(50, -350));
 }
 
 TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenUIScale) {
   // 1st display is 2x density with 1.5 UI scale.
   UpdateDisplay("100+100-200x200*2@1.5,100+500-200x200");
   // Put |window_| to the 1st.
   window_->SetBoundsInScreen(gfx::Rect(20, 20, 50, 50),
-                             Shell::GetScreen()->GetPrimaryDisplay());
+                             gfx::Screen::GetScreen()->GetPrimaryDisplay());
 
   // The point is on the 1st host.
   EXPECT_EQ("45,45", ConvertHostPointToScreen(60, 60));
   // The point is out of the host windows.
   EXPECT_EQ("45,225", ConvertHostPointToScreen(60, 300));
   // The point is on the 2nd host. Point on 2nd host (60,150) -
   // - screen [+(150,0)]
   EXPECT_EQ("210,49", ConvertHostPointToScreen(60, 450));
 
   // Move |window_| to the 2nd.
@@ skipping 85 matching lines @@
   // destroyed.
   EXPECT_FALSE(tracker.Contains(root_windows[1]));
 
   // Check that we could convert all of the mouse events we got to screen
   // coordinates.
   EXPECT_TRUE(event_handler->could_convert_to_screen());
 }
 
 }  // namespace test
 }  // namespace ash