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

ash/display/extended_mouse_warp_controller.cc

Index: ash/display/extended_mouse_warp_controller.cc
diff --git a/ash/display/extended_mouse_warp_controller.cc b/ash/display/extended_mouse_warp_controller.cc
index a28de78d3d73cb15f8af5c7040a1cc4fb18f09d6..07fd7c9281632e5a8c937f3400c884329b83615b 100644
--- a/ash/display/extended_mouse_warp_controller.cc
+++ b/ash/display/extended_mouse_warp_controller.cc
@@ -58,7 +58,7 @@ ExtendedMouseWarpController::~ExtendedMouseWarpController() {
 }
 
 bool ExtendedMouseWarpController::WarpMouseCursor(ui::MouseEvent* event) {
-  if (Shell::GetScreen()->GetNumDisplays() <= 1 || !enabled_)
+  if (gfx::Screen::GetScreen()->GetNumDisplays() <= 1 || !enabled_)
     return false;
 
   aura::Window* target = static_cast<aura::Window*>(event->target());
@@ -122,7 +122,7 @@ void ExtendedMouseWarpController::UpdateHorizontalEdgeBounds() {
   // GetPrimaryDisplay returns an object on stack, so copy the bounds
   // instead of using reference.
   const gfx::Rect primary_bounds =
-      Shell::GetScreen()->GetPrimaryDisplay().bounds();
+      gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds();
   const gfx::Rect secondary_bounds = ScreenUtil::GetSecondaryDisplay().bounds();
   DisplayLayout::Position position = Shell::GetInstance()
                                          ->display_manager()
@@ -163,7 +163,7 @@ void ExtendedMouseWarpController::UpdateVerticalEdgeBounds() {
   // GetPrimaryDisplay returns an object on stack, so copy the bounds
   // instead of using reference.
   const gfx::Rect primary_bounds =
-      Shell::GetScreen()->GetPrimaryDisplay().bounds();
+      gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds();
   const gfx::Rect secondary_bounds = ScreenUtil::GetSecondaryDisplay().bounds();
   DisplayLayout::Position position = Shell::GetInstance()
                                          ->display_manager()