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

ash/wm/ash_native_cursor_manager_unittest.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/wm/ash_native_cursor_manager.h"
 
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/shell.h"
@@ skipping 141 matching lines @@
 TEST_F(AshNativeCursorManagerTest, FractionalScale) {
   ::wm::CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
   CursorManagerTestApi test_api(cursor_manager);
   // Cursor should use the resource scale factor.
   UpdateDisplay("800x100*1.25");
   EXPECT_EQ(1.0f, test_api.GetCurrentCursor().device_scale_factor());
 }
 #endif
 
 TEST_F(AshNativeCursorManagerTest, UIScaleShouldNotChangeCursor) {
-  int64_t display_id = Shell::GetScreen()->GetPrimaryDisplay().id();
+  int64_t display_id = gfx::Screen::GetScreen()->GetPrimaryDisplay().id();
   gfx::Display::SetInternalDisplayId(display_id);
 
   ::wm::CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
   CursorManagerTestApi test_api(cursor_manager);
 
   SetDisplayUIScale(display_id, 0.5f);
-  EXPECT_EQ(1.0f,
-            Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
+  EXPECT_EQ(
+      1.0f,
+      gfx::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_EQ(1.0f, test_api.GetCurrentCursor().device_scale_factor());
 
   SetDisplayUIScale(display_id, 1.0f);
 
   // 2x display should keep using 2x cursor regardless of the UI scale.
   UpdateDisplay("800x800*2");
-  EXPECT_EQ(2.0f,
-            Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
+  EXPECT_EQ(
+      2.0f,
+      gfx::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_EQ(2.0f, test_api.GetCurrentCursor().device_scale_factor());
   SetDisplayUIScale(display_id, 2.0f);
-  EXPECT_EQ(1.0f,
-            Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
+  EXPECT_EQ(
+      1.0f,
+      gfx::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_EQ(2.0f, test_api.GetCurrentCursor().device_scale_factor());
 }
 
 #if defined(USE_X11)
 // This test is in ash_unittests because ui_base_unittests does not include
 // 2x assets. crbug.com/372541.
 TEST_F(AshNativeCursorManagerTest, CursorLoaderX11Test) {
   const int kCursorId = 1;
   ui::CursorLoaderX11 loader;
   loader.set_scale(1.0f);
 
   loader.LoadImageCursor(kCursorId, IDR_AURA_CURSOR_MOVE, gfx::Point());
   const XcursorImage* image = loader.GetXcursorImageForTest(kCursorId);
   int height = image->height;
   int width = image->width;
   loader.UnloadAll();
 
   // Load 2x cursor and make sure its size is 2x of the 1x cusor.
   loader.set_scale(2.0f);
   loader.LoadImageCursor(kCursorId, IDR_AURA_CURSOR_MOVE, gfx::Point());
   image = loader.GetXcursorImageForTest(kCursorId);
   EXPECT_EQ(height * 2, static_cast<int>(image->height));
   EXPECT_EQ(width * 2, static_cast<int>(image->width));
 }
 #endif
 
 }  // namespace test
 }  // namespace ash