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

ash/display/mouse_cursor_event_filter_unittest.cc

Index: ash/display/mouse_cursor_event_filter_unittest.cc
diff --git a/ash/display/mouse_cursor_event_filter_unittest.cc b/ash/display/mouse_cursor_event_filter_unittest.cc
index 2c050bae1bfd644abb48bcad511148705eb774ce..95433e3c836981389265041e38fccdaa81cecdc4 100644
--- a/ash/display/mouse_cursor_event_filter_unittest.cc
+++ b/ash/display/mouse_cursor_event_filter_unittest.cc
@@ -17,12 +17,12 @@ namespace internal {
 namespace {
 
 gfx::Display GetPrimaryDisplay() {
-  return gfx::Screen::GetDisplayNearestWindow(
+  return Shell::GetScreen()->GetDisplayNearestWindow(
       Shell::GetAllRootWindows()[0]);
 }
 
 gfx::Display GetSecondaryDisplay() {
-  return gfx::Screen::GetDisplayNearestWindow(
+  return Shell::GetScreen()->GetDisplayNearestWindow(
       Shell::GetAllRootWindows()[1]);
 }
 
@@ -52,7 +52,7 @@ TEST_F(MouseCursorEventFilterTest, WarpMouse) {
 
   // Touch the right edge of the primary root window. Pointer should warp.
   is_warped = event_filter->WarpMouseCursorIfNecessary(root_windows[0],
-                                                     gfx::Point(499, 11));
+                                                       gfx::Point(499, 11));
   EXPECT_TRUE(is_warped);
   EXPECT_EQ("501,11",  // by 2px.
             aura::Env::GetInstance()->last_mouse_location().ToString());