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

ash/magnifier/magnification_controller.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/magnifier/magnification_controller.h"
 
 #include <utility>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accessibility_delegate.h"
@@ skipping 354 matching lines @@
   ui::ScopedLayerAnimationSettings settings(
       root_window_->layer()->GetAnimator());
   settings.AddObserver(this);
   settings.SetPreemptionStrategy(
       ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
   settings.SetTweenType(tween_type);
   settings.SetTransitionDuration(
       base::TimeDelta::FromMilliseconds(duration_in_ms));
 
   gfx::Display display =
-      Shell::GetScreen()->GetDisplayNearestWindow(root_window_);
+      gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_window_);
   scoped_ptr<RootWindowTransformer> transformer(
       CreateRootWindowTransformerForDisplay(root_window_, display));
   GetRootWindowController(root_window_)
       ->ash_host()
       ->SetRootWindowTransformer(std::move(transformer));
 
   if (duration_in_ms > 0)
     is_on_animation_ = true;
 
   return true;
@@ skipping 467 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MagnificationController:
 
 // static
 MagnificationController* MagnificationController::CreateInstance() {
   return new MagnificationControllerImpl();
 }
 
 }  // namespace ash