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

ash/wm/window_positioner_unittest.cc

 // Copyright 2013 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/wm/window_positioner.h"
 
 #include <string>
 
 #include "ash/shell.h"
 #include "ash/shell/toplevel_window.h"
@@ skipping 42 matching lines @@
   params.can_maximize = true;
   views::Widget* widget =
       shell::ToplevelWindow::CreateToplevelWindow(params);
   gfx::Rect bounds = widget->GetWindowBoundsInScreen();
 #if defined(OS_WIN)
   EXPECT_TRUE(widget->IsMaximized());
 #else
   // The window should be in the 2nd display with the default size.
   EXPECT_EQ("300x300", bounds.size().ToString());
 #endif
-  EXPECT_TRUE(Shell::GetScreen()->GetDisplayNearestWindow(
-      second_root_window).bounds().Contains(bounds));
+  EXPECT_TRUE(gfx::Screen::GetScreen()
+                  ->GetDisplayNearestWindow(second_root_window)
+                  .bounds()
+                  .Contains(bounds));
 }
 
 // Tests that second window inherits first window's maximized state as well as
 // its restore bounds.
 TEST_F(WindowPositionerTest, SecondMaximizedWindowHasProperRestoreSize) {
 #if defined(OS_WIN)
   ash::WindowPositioner::SetMaximizeFirstWindow(true);
 #endif
   UpdateDisplay("1400x900");
   shell::ToplevelWindow::CreateParams params;
@@ skipping 87 matching lines @@
   const std::string resolution = base::IntToString(width) + "x300";
   UpdateDisplay(resolution);
   gfx::Rect bounds_in_out(0, 0, 320, 240);  // Random bounds.
   ui::WindowShowState show_state_out = ui::SHOW_STATE_DEFAULT;
 
   test::TestShellDelegate* const delegate =
       static_cast<test::TestShellDelegate*>(Shell::GetInstance()->delegate());
   delegate->SetForceMaximizeOnFirstRun(true);
 
   WindowPositioner::GetBoundsAndShowStateForNewWindow(
-      Shell::GetScreen(), nullptr, false, ui::SHOW_STATE_DEFAULT,
+      gfx::Screen::GetScreen(), nullptr, false, ui::SHOW_STATE_DEFAULT,
       &bounds_in_out, &show_state_out);
 
   EXPECT_EQ(show_state_out, ui::SHOW_STATE_MAXIMIZED);
 }
 
 // For detail see description of FirstRunMaximizeWindowHighResloution.
 TEST_F(WindowPositionerTest, FirstRunMaximizeWindowLowResolution) {
   const int width = ash::WindowPositioner::GetForceMaximizedWidthLimit() - 100;
   // Set resolution to 1266x300.
   const std::string resolution = base::IntToString(width) + "x300";
   UpdateDisplay(resolution);
   gfx::Rect bounds_in_out(0, 0, 320, 240);  // Random bounds.
   ui::WindowShowState show_state_out = ui::SHOW_STATE_DEFAULT;
 
   test::TestShellDelegate* const delegate =
       static_cast<test::TestShellDelegate*>(Shell::GetInstance()->delegate());
   delegate->SetForceMaximizeOnFirstRun(true);
 
   WindowPositioner::GetBoundsAndShowStateForNewWindow(
-      Shell::GetScreen(), nullptr, false, ui::SHOW_STATE_DEFAULT,
+      gfx::Screen::GetScreen(), nullptr, false, ui::SHOW_STATE_DEFAULT,
       &bounds_in_out, &show_state_out);
 
   EXPECT_EQ(show_state_out, ui::SHOW_STATE_MAXIMIZED);
 }
 
 TEST_F(WindowPositionerTest, IgnoreFullscreenInAutoRearrange) {
   if (!SupportsHostWindowResize())
     return;
   // Set bigger than 1366 so that the new window is opened in normal state.
   UpdateDisplay("1400x800");
@@ skipping 21 matching lines @@
   widget1->SetFullscreen(false);
   ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString());
 
   // Closing 2nd widget triggers the rearrange logic but the 1st
   // widget should stay in the current size.
   widget2->CloseNow();
   ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString());
 }
 
 }  // namespace ash