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

ash/test/ui_controls_factory_ash.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/shell.h"
 #include "ash/shell_factory.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/screen_position_client.h"
@@ skipping 79 matching lines @@
   bool SendMouseMoveNotifyWhenDone(long x,
                                    long y,
                                    const base::Closure& closure) override {
     gfx::Point p(x, y);
     UIControlsAura* ui_controls = GetUIControlsAt(p);
     return ui_controls &&
         ui_controls->SendMouseMoveNotifyWhenDone(p.x(), p.y(), closure);
   }
 
   bool SendMouseEvents(MouseButton type, int state) override {
-    gfx::Point p(ash::Shell::GetScreen()->GetCursorScreenPoint());
+    gfx::Point p(gfx::Screen::GetScreen()->GetCursorScreenPoint());
     UIControlsAura* ui_controls = GetUIControlsAt(p);
     return ui_controls && ui_controls->SendMouseEvents(type, state);
   }
 
   bool SendMouseEventsNotifyWhenDone(MouseButton type,
                                      int state,
                                      const base::Closure& closure) override {
     gfx::Point p(aura::Env::GetInstance()->last_mouse_location());
     UIControlsAura* ui_controls = GetUIControlsAt(p);
     return ui_controls && ui_controls->SendMouseEventsNotifyWhenDone(
         type, state, closure);
   }
 
   bool SendMouseClick(MouseButton type) override {
-    gfx::Point p(ash::Shell::GetScreen()->GetCursorScreenPoint());
+    gfx::Point p(gfx::Screen::GetScreen()->GetCursorScreenPoint());
     UIControlsAura* ui_controls = GetUIControlsAt(p);
     return ui_controls && ui_controls->SendMouseClick(type);
   }
 
   void RunClosureAfterAllPendingUIEvents(
       const base::Closure& closure) override {
     UIControlsAura* ui_controls = GetUIControlsForRootWindow(
         ash::Shell::GetTargetRootWindow());
     if (ui_controls)
       ui_controls->RunClosureAfterAllPendingUIEvents(closure);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(UIControlsAsh);
 };
 
 ui_controls::UIControlsAura* CreateAshUIControls() {
   return new ash::test::UIControlsAsh();
 }
 
 }  // namespace test
 }  // namespace ash