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

ash/wm/window_manager_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/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/cursor_manager.h"
@@ skipping 446 matching lines @@
 }
 
 #if defined(OS_MACOSX)
 #define MAYBE_TransformActivate FAILS_TransformActivate
 #else
 #define MAYBE_TransformActivate TransformActivate
 #endif
 TEST_F(WindowManagerTest, MAYBE_TransformActivate) {
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
   gfx::Size size = root_window->bounds().size();
-  EXPECT_EQ(
-      gfx::Rect(size).ToString(),
-      gfx::Screen::GetDisplayNearestPoint(gfx::Point()).bounds().ToString());
+  EXPECT_EQ(gfx::Rect(size).ToString(),
+            Shell::GetScreen()->GetDisplayNearestPoint(
+                gfx::Point()).bounds().ToString());
 
   // Rotate it clock-wise 90 degrees.
   ui::Transform transform;
   transform.SetRotate(90.0f);
   transform.ConcatTranslate(size.width(), 0);
   root_window->SetTransform(transform);
 
   test::TestActivationDelegate d1;
   aura::test::TestWindowDelegate wd;
   scoped_ptr<aura::Window> w1(
@@ skipping 140 matching lines @@
   cursor_manager->ShowCursor(true);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_TRUE(cursor_manager->cursor_visible());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed2);
   EXPECT_FALSE(cursor_manager->cursor_visible());
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_TRUE(cursor_manager->cursor_visible());
 }
 
 }  // namespace ash