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

chrome/browser/extensions/display_info_provider_chromeos_unittest.cc

 // Copyright 2014 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 "extensions/browser/api/system_display/display_info_provider.h"
 
 #include <stdint.h>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
@@ skipping 752 matching lines @@
   std::string error;
   CallSetDisplayUnitInfo(
       base::Int64ToString(secondary.id()), info, &success, &error);
 
   ASSERT_FALSE(success);
   ASSERT_EQ("Bounds origin not allowed for the primary display.", error);
 
   EXPECT_EQ("1200,0 300x500", secondary.bounds().ToString());
   // The operation failed because the primary property would be set before
   // setting bounds. The primary display shouldn't have been changed, though.
-  EXPECT_NE(ash::Shell::GetScreen()->GetPrimaryDisplay().id(), secondary.id());
+  EXPECT_NE(gfx::Screen::GetScreen()->GetPrimaryDisplay().id(), secondary.id());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginWithMirroring) {
   UpdateDisplay("1200x600,600x1000*2");
 
   const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
-  const gfx::Display& primary = ash::Shell::GetScreen()->GetPrimaryDisplay();
+  const gfx::Display& primary = gfx::Screen::GetScreen()->GetPrimaryDisplay();
 
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(300));
   info.mirroring_source_id.reset(
       new std::string(base::Int64ToString(primary.id())));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(
       base::Int64ToString(secondary.id()), info, &success, &error);
@@ skipping 35 matching lines @@
   // Switch primary display.
   info.is_primary.reset(new bool(true));
   CallSetDisplayUnitInfo(
       base::Int64ToString(secondary.id()), info, &success, &error);
 
   ASSERT_TRUE(success);
   EXPECT_TRUE(error.empty());
 
   EXPECT_EQ("0,0 300x500", secondary.bounds().ToString());
   EXPECT_EQ(gfx::Display::ROTATE_180, secondary.rotation());
-  EXPECT_EQ(ash::Shell::GetScreen()->GetPrimaryDisplay().id(), secondary.id());
+  EXPECT_EQ(gfx::Screen::GetScreen()->GetPrimaryDisplay().id(), secondary.id());
 
   info.rotation.reset(new int(0));
   CallSetDisplayUnitInfo(
       base::Int64ToString(secondary.id()), info, &success, &error);
 
   ASSERT_TRUE(success);
   EXPECT_TRUE(error.empty());
 
   EXPECT_EQ("0,0 300x500", secondary.bounds().ToString());
   EXPECT_EQ(gfx::Display::ROTATE_0, secondary.rotation());
-  EXPECT_EQ(ash::Shell::GetScreen()->GetPrimaryDisplay().id(), secondary.id());
+  EXPECT_EQ(gfx::Screen::GetScreen()->GetPrimaryDisplay().id(), secondary.id());
 }
 
 // Tests that rotation changes made before entering maximize mode are restored
 // upon exiting maximize mode, and that a rotation lock is not set.
 TEST_F(DisplayInfoProviderChromeosTest, SetRotationBeforeMaximizeMode) {
   ash::ScreenOrientationController* screen_orientation_controller =
       ash::Shell::GetInstance()->screen_orientation_controller();
   api::system_display::DisplayProperties info;
   info.rotation.reset(new int(90));
 
@@ skipping 221 matching lines @@
   std::string error;
   CallSetDisplayUnitInfo(
       base::Int64ToString(internal_display_id), info, &success, &error);
 
   ASSERT_FALSE(success);
   EXPECT_EQ("Overscan changes not allowed for the internal monitor.", error);
 }
 
 }  // namespace
 }  // namespace extensions