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

ash/extended_desktop_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/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray.h"
@@ skipping 271 matching lines @@
 TEST_F(ExtendedDesktopTest, TestCursorLocation) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("1000x600,600x400");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   aura::test::WindowTestApi root_window0_test_api(root_windows[0]);
   aura::test::WindowTestApi root_window1_test_api(root_windows[1]);
 
   root_windows[0]->MoveCursorTo(gfx::Point(10, 10));
-  EXPECT_EQ("10,10", Shell::GetScreen()->GetCursorScreenPoint().ToString());
+  EXPECT_EQ("10,10",
+            gfx::Screen::GetScreen()->GetCursorScreenPoint().ToString());
   EXPECT_TRUE(root_window0_test_api.ContainsMouse());
   EXPECT_FALSE(root_window1_test_api.ContainsMouse());
   root_windows[1]->MoveCursorTo(gfx::Point(10, 20));
-  EXPECT_EQ("1010,20", Shell::GetScreen()->GetCursorScreenPoint().ToString());
+  EXPECT_EQ("1010,20",
+            gfx::Screen::GetScreen()->GetCursorScreenPoint().ToString());
   EXPECT_FALSE(root_window0_test_api.ContainsMouse());
   EXPECT_TRUE(root_window1_test_api.ContainsMouse());
   root_windows[0]->MoveCursorTo(gfx::Point(20, 10));
-  EXPECT_EQ("20,10", Shell::GetScreen()->GetCursorScreenPoint().ToString());
+  EXPECT_EQ("20,10",
+            gfx::Screen::GetScreen()->GetCursorScreenPoint().ToString());
   EXPECT_TRUE(root_window0_test_api.ContainsMouse());
   EXPECT_FALSE(root_window1_test_api.ContainsMouse());
 }
 
 TEST_F(ExtendedDesktopTest, GetRootWindowAt) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("700x500,500x500");
   SetSecondaryDisplayLayout(DisplayLayout::LEFT);
@@ skipping 291 matching lines @@
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
 }
 
 TEST_F(ExtendedDesktopTest, MoveWindowToDisplay) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("1000x1000,1000x1000");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
-  gfx::Display display0 = Shell::GetScreen()->GetDisplayMatching(
+  gfx::Display display0 = gfx::Screen::GetScreen()->GetDisplayMatching(
       root_windows[0]->GetBoundsInScreen());
-  gfx::Display display1 = Shell::GetScreen()->GetDisplayMatching(
+  gfx::Display display1 = gfx::Screen::GetScreen()->GetDisplayMatching(
       root_windows[1]->GetBoundsInScreen());
   EXPECT_NE(display0.id(), display1.id());
 
   views::Widget* d1 = CreateTestWidget(gfx::Rect(10, 10, 1000, 100));
   EXPECT_EQ(root_windows[0], d1->GetNativeView()->GetRootWindow());
 
   // Move the window where the window spans both root windows. Since the second
   // parameter is |display1|, the window should be shown on the secondary root.
   d1->GetNativeWindow()->SetBoundsInScreen(gfx::Rect(500, 10, 1000, 100),
                                            display1);
@@ skipping 65 matching lines @@
   EXPECT_EQ(root_windows[1], w1_t1->GetNativeView()->GetRootWindow());
   EXPECT_EQ("10,50 50x50",
             w1_t1->GetWindowBoundsInScreen().ToString());
 }
 
 // Test if the Window::ConvertPointToTarget works across root windows.
 // TODO(oshima): Move multiple display suport and this test to aura.
 TEST_F(ExtendedDesktopTest, ConvertPoint) {
   if (!SupportsMultipleDisplays())
     return;
-  gfx::Screen* screen = Shell::GetScreen();
+  gfx::Screen* screen = gfx::Screen::GetScreen();
   UpdateDisplay("1000x600,600x400");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   gfx::Display display_1 = screen->GetDisplayNearestWindow(root_windows[0]);
   EXPECT_EQ("0,0", display_1.bounds().origin().ToString());
   gfx::Display display_2 = screen->GetDisplayNearestWindow(root_windows[1]);
   EXPECT_EQ("1000,0", display_2.bounds().origin().ToString());
 
   aura::Window* d1 =
       CreateTestWidget(gfx::Rect(10, 10, 100, 100))->GetNativeView();
   aura::Window* d2 =
@@ skipping 117 matching lines @@
 }
 
 TEST_F(ExtendedDesktopTest, KeyEventsOnLockScreen) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("100x100,200x200");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
   // Create normal windows on both displays.
-  views::Widget* widget1 = CreateTestWidget(
-      Shell::GetScreen()->GetPrimaryDisplay().bounds());
+  views::Widget* widget1 =
+      CreateTestWidget(gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds());
   widget1->Show();
   EXPECT_EQ(root_windows[0], widget1->GetNativeView()->GetRootWindow());
   views::Widget* widget2 = CreateTestWidget(
       ScreenUtil::GetSecondaryDisplay().bounds());
   widget2->Show();
   EXPECT_EQ(root_windows[1], widget2->GetNativeView()->GetRootWindow());
 
   // Create a LockScreen window.
-  views::Widget* lock_widget = CreateTestWidget(
-      Shell::GetScreen()->GetPrimaryDisplay().bounds());
+  views::Widget* lock_widget =
+      CreateTestWidget(gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds());
   views::Textfield* textfield = new views::Textfield;
   lock_widget->client_view()->AddChildView(textfield);
 
   ash::Shell::GetContainer(Shell::GetPrimaryRootWindow(),
                            ash::kShellWindowId_LockScreenContainer)
       ->AddChild(lock_widget->GetNativeView());
   lock_widget->Show();
   textfield->RequestFocus();
 
   aura::client::FocusClient* focus_client =
@@ skipping 65 matching lines @@
   generator.ReleaseLeftButton();
   EXPECT_EQ("-999,-999 -999,-999", event_handler.GetLocationsAndReset());
 
   generator.MoveMouseTo(400, 150);
   EXPECT_EQ("100,150 100,150", event_handler.GetLocationsAndReset());
 
   ash::Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
 }  // namespace ash