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

ash/extended_desktop_unittest.cc

Index: ash/extended_desktop_unittest.cc
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index 5f4dd6c52d5e8a9f11c1c159cf679871899d48a7..44d978272506f947f8a1026c47464ba4a5917472 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -190,15 +190,18 @@ TEST_F(ExtendedDesktopTest, TestCursorLocation) {
   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",
+      ash::Shell::GetAshScreen()->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",
+      ash::Shell::GetAshScreen()->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",
+      ash::Shell::GetAshScreen()->GetCursorScreenPoint().ToString());
   EXPECT_TRUE(root_window0_test_api.ContainsMouse());
   EXPECT_FALSE(root_window1_test_api.ContainsMouse());
 }
@@ -409,9 +412,11 @@ TEST_F(ExtendedDesktopTest, MoveWindowToDisplay) {
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   gfx::Display display0 =
-      gfx::Screen::GetDisplayMatching(root_windows[0]->GetBoundsInScreen());
+      ash::Shell::GetAshScreen()->GetDisplayMatching(
+          root_windows[0]->GetBoundsInScreen());
   gfx::Display display1 =
-      gfx::Screen::GetDisplayMatching(root_windows[1]->GetBoundsInScreen());
+      ash::Shell::GetAshScreen()->GetDisplayMatching(
+          root_windows[1]->GetBoundsInScreen());
   EXPECT_NE(display0.id(), display1.id());
 
   views::Widget* d1 = CreateTestWidget(gfx::Rect(10, 10, 1000, 100));