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

ash/display/screen_ash_unittest.cc

 // Copyright 2015 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/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 
 class ScreenAshTest : public test::AshTestBase {
  public:
   ScreenAshTest() {}
   ~ScreenAshTest() override {}
 
-  static gfx::Screen* Screen() { return Shell::GetScreen(); }
+  static gfx::Screen* Screen() { return gfx::Screen::GetScreen(); }

[sky, 2016/01/20 04:44:26]

Nuke this too.

[scottmg, 2016/01/26 20:46:35]

Done.

 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenAshTest);
 };
 
 // Tests that ScreenAsh::GetWindowAtScreenPoint() returns the correct window on
 // the correct display.
 TEST_F(ScreenAshTest, TestGetWindowAtScreenPoint) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("200x200,400x400");
 
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> win1(CreateTestWindowInShellWithDelegate(
       &delegate, 0, gfx::Rect(0, 0, 200, 200)));
 
   scoped_ptr<aura::Window> win2(CreateTestWindowInShellWithDelegate(
       &delegate, 1, gfx::Rect(200, 200, 100, 100)));
 
   ASSERT_NE(win1->GetRootWindow(), win2->GetRootWindow());
 
   EXPECT_EQ(win1.get(), Screen()->GetWindowAtScreenPoint(gfx::Point(50, 60)));
   EXPECT_EQ(win2.get(), Screen()->GetWindowAtScreenPoint(gfx::Point(250, 260)));
 }
 
 }  // namespace ash