Add context to gfx::Screen calls in support of simultaneous desktop+ash

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_controller.h"
 #include "ash/display/multi_display_manager.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray.h"
@@ skipping 176 matching lines @@
   EXPECT_EQ(ui::kCursorCopy, root_windows[1]->last_cursor().native_type());
 }
 
 TEST_F(ExtendedDesktopTest, TestCursorLocation) {
   UpdateDisplay("0+0-1000x600,1001+0-600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   aura::Window::TestApi root_window0_test_api(root_windows[0]);
   aura::Window::TestApi root_window1_test_api(root_windows[1]);
 
   root_windows[0]->MoveCursorTo(gfx::Point(10, 10));
-  EXPECT_EQ("10,10", gfx::Screen::GetCursorScreenPoint().ToString());
+  EXPECT_EQ("10,10", Shell::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", gfx::Screen::GetCursorScreenPoint().ToString());
+  EXPECT_EQ("1010,20", Shell::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", gfx::Screen::GetCursorScreenPoint().ToString());
+  EXPECT_EQ("20,10", Shell::GetScreen()->GetCursorScreenPoint().ToString());
   EXPECT_TRUE(root_window0_test_api.ContainsMouse());
   EXPECT_FALSE(root_window1_test_api.ContainsMouse());
 }
 
 TEST_F(ExtendedDesktopTest, CycleWindows) {
   UpdateDisplay("700x500,500x500");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   WindowCycleController* controller =
       Shell::GetInstance()->window_cycle_controller();
@@ skipping 189 matching lines @@
   // Setting outside of root windows will be moved to primary root window.
   // TODO(oshima): This one probably should pick the closest root window.
   d1->SetBounds(gfx::Rect(200, 10, 100, 100));
   EXPECT_EQ(root_windows[0], d1->GetNativeView()->GetRootWindow());
 }
 
 TEST_F(ExtendedDesktopTest, MoveWindowToDisplay) {
   UpdateDisplay("1000x1000,1000x1000");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
-  gfx::Display display0 =
-      gfx::Screen::GetDisplayMatching(root_windows[0]->GetBoundsInScreen());
-  gfx::Display display1 =
-      gfx::Screen::GetDisplayMatching(root_windows[1]->GetBoundsInScreen());
+  gfx::Display display0 = Shell::GetScreen()->GetDisplayMatching(
+      root_windows[0]->GetBoundsInScreen());
+  gfx::Display display1 = Shell::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);
   EXPECT_EQ("500,10 1000x100",
@@ skipping 173 matching lines @@
   w1->SetBounds(gfx::Rect(10, 10, 50, 50));
   EXPECT_EQ(root_windows[0], w1->GetNativeView()->GetRootWindow());
 }
 
 TEST_F(ExtendedDesktopTest, KeyEventsOnLockScreen) {
   UpdateDisplay("100x100,200x200");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   // Create normal windows on both displays.
   views::Widget* widget1 = CreateTestWidget(
-      gfx::Screen::GetPrimaryDisplay().bounds());
+      Shell::GetScreen()->GetPrimaryDisplay().bounds());
   widget1->Show();
   EXPECT_EQ(root_windows[0], widget1->GetNativeView()->GetRootWindow());
   views::Widget* widget2 = CreateTestWidget(
       ScreenAsh::GetSecondaryDisplay().bounds());
   widget2->Show();
   EXPECT_EQ(root_windows[1], widget2->GetNativeView()->GetRootWindow());
 
   // Create a LockScreen window.
   views::Widget* lock_widget = CreateTestWidget(
-      gfx::Screen::GetPrimaryDisplay().bounds());
+      Shell::GetScreen()->GetPrimaryDisplay().bounds());
   views::Textfield* textfield = new views::Textfield;
   lock_widget->SetContentsView(textfield);
 
   ash::Shell::GetContainer(
       Shell::GetPrimaryRootWindow(),
       ash::internal::kShellWindowId_LockScreenContainer)->
       AddChild(lock_widget->GetNativeView());
   lock_widget->Show();
   textfield->RequestFocus();
 
@@ skipping 31 matching lines @@
 
   aura::test::EventGenerator generator22(root_windows[1]);
   generator22.PressKey(ui::VKEY_E, 0);
   generator22.ReleaseKey(ui::VKEY_E, 0);
   EXPECT_EQ(lock_widget->GetNativeView(), focus_manager->GetFocusedWindow());
   EXPECT_EQ("abcde", UTF16ToASCII(textfield->text()));
 }
 
 }  // namespace internal
 }  // namespace ash