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

ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc

 // Copyright (c) 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/content/keyboard_overlay/keyboard_overlay_delegate.h"
 
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 30 matching lines @@
                                    GURL("chrome://keyboardoverlay/"));
   // Showing the dialog creates a widget.
   views::Widget* widget = delegate.Show(NULL);
   EXPECT_TRUE(widget);
 
   // The widget is on the primary root window.
   EXPECT_EQ(Shell::GetPrimaryRootWindow(),
             widget->GetNativeWindow()->GetRootWindow());
 
   // The widget is horizontally centered at the bottom of the work area.
-  gfx::Rect work_area = Shell::GetScreen()->GetPrimaryDisplay().work_area();
+  gfx::Rect work_area =
+      gfx::Screen::GetScreen()->GetPrimaryDisplay().work_area();
   gfx::Rect bounds = widget->GetRestoredBounds();
   EXPECT_EQ(work_area.CenterPoint().x(), bounds.CenterPoint().x());
   EXPECT_EQ(work_area.bottom(), bounds.bottom());
 
   // Clean up.
   widget->CloseNow();
 }
 
 // Tests run three times - for all possible values of shelf alignment
 INSTANTIATE_TEST_CASE_P(ShelfAlignmentAny,
                         KeyboardOverlayDelegateTest,
                         testing::Values(SHELF_ALIGNMENT_BOTTOM,
                                         SHELF_ALIGNMENT_LEFT,
                                         SHELF_ALIGNMENT_RIGHT,
                                         SHELF_ALIGNMENT_TOP));
 
 }  // namespace ash