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

ash/wm/base_layout_manager_unittest.cc

Index: ash/wm/base_layout_manager_unittest.cc
diff --git a/ash/wm/base_layout_manager_unittest.cc b/ash/wm/base_layout_manager_unittest.cc
index d9938851d3c13eb00dac2163176b069fc9cc8dc6..9bc60395f85053e07218bf9658725426cf2cbb15 100644
--- a/ash/wm/base_layout_manager_unittest.cc
+++ b/ash/wm/base_layout_manager_unittest.cc
@@ -101,7 +101,8 @@ TEST_F(BaseLayoutManagerTest, Fullscreen) {
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   // Fullscreen window fills the whole display.
   EXPECT_EQ(
-      gfx::Screen::GetDisplayNearestWindow(window.get()).bounds().ToString(),
+      ash::Shell::GetAshScreen()->GetDisplayNearestWindow(
+          window.get()).bounds().ToString(),
       window->bounds().ToString());
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(bounds.ToString(), window->bounds().ToString());
@@ -114,12 +115,14 @@ TEST_F(BaseLayoutManagerTest, FullscreenRootWindowResize) {
   // Fullscreen window fills the whole display.
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   EXPECT_EQ(
-      gfx::Screen::GetDisplayNearestWindow(window.get()).bounds().ToString(),
+      ash::Shell::GetAshScreen()->GetDisplayNearestWindow(
+          window.get()).bounds().ToString(),
       window->bounds().ToString());
   // Enlarge the root window.  We should still match the display size.
   Shell::GetPrimaryRootWindow()->SetHostSize(gfx::Size(800, 600));
   EXPECT_EQ(
-      gfx::Screen::GetDisplayNearestWindow(window.get()).bounds().ToString(),
+      ash::Shell::GetAshScreen()->GetDisplayNearestWindow(
+          window.get()).bounds().ToString(),
       window->bounds().ToString());
 }
 
@@ -135,21 +138,23 @@ TEST_F(BaseLayoutManagerTest, FullscreenRootWindowResize) {
 TEST_F(BaseLayoutManagerTest, MAYBE_RootWindowResizeShrinksWindows) {
   scoped_ptr<aura::Window> window(
       CreateTestWindow(gfx::Rect(10, 20, 500, 400)));
-  gfx::Rect work_area =
-      gfx::Screen::GetDisplayNearestWindow(window.get()).work_area();
+  gfx::Rect work_area = ash::Shell::GetAshScreen()->
+      GetDisplayNearestWindow(window.get()).work_area();
   // Invariant: Window is smaller than work area.
   EXPECT_LE(window->bounds().width(), work_area.width());
   EXPECT_LE(window->bounds().height(), work_area.height());
 
   // Make the root window narrower than our window.
   Shell::GetPrimaryRootWindow()->SetHostSize(gfx::Size(300, 400));
-  work_area = gfx::Screen::GetDisplayNearestWindow(window.get()).work_area();
+  work_area = ash::Shell::GetAshScreen()->
+      GetDisplayNearestWindow(window.get()).work_area();
   EXPECT_LE(window->bounds().width(), work_area.width());
   EXPECT_LE(window->bounds().height(), work_area.height());
 
   // Make the root window shorter than our window.
   Shell::GetPrimaryRootWindow()->SetHostSize(gfx::Size(300, 200));
-  work_area = gfx::Screen::GetDisplayNearestWindow(window.get()).work_area();
+  work_area = ash::Shell::GetAshScreen()->
+      GetDisplayNearestWindow(window.get()).work_area();
   EXPECT_LE(window->bounds().width(), work_area.width());
   EXPECT_LE(window->bounds().height(), work_area.height());
 
@@ -164,7 +169,7 @@ TEST_F(BaseLayoutManagerTest, MAYBE_RootWindowResizeShrinksWindows) {
 // to smaller than the full work area.
 TEST_F(BaseLayoutManagerTest, BoundsWithScreenEdgeVisible) {
   // Create a window with bounds that fill the screen.
-  gfx::Rect bounds = gfx::Screen::GetPrimaryDisplay().bounds();
+  gfx::Rect bounds = ash::Shell::GetAshScreen()->GetPrimaryDisplay().bounds();
   scoped_ptr<aura::Window> window(CreateTestWindow(bounds));
   // Maximize it, which writes the old bounds to restore bounds.
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);