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

ash/wm/toplevel_window_event_handler_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/wm/toplevel_window_event_handler.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/snap_sizer.h"
@@ skipping 312 matching lines @@
 
   // Simulate a large bottom-right to top-left drag.  Window size should be
   // clamped to minimum and position should not change.
   DragFromCenterBy(w1.get(), -333, -444);
   EXPECT_EQ(position, w1->bounds().origin());
   EXPECT_EQ(gfx::Size(40, 40), w1->bounds().size());
 }
 
 TEST_F(ToplevelWindowEventHandlerTest, BottomRightWorkArea) {
   scoped_ptr<aura::Window> target(CreateWindow(HTBOTTOMRIGHT));
-  gfx::Rect work_area =
-      gfx::Screen::GetDisplayNearestWindow(target.get()).work_area();
+  gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow(
+      target.get()).work_area();
   gfx::Point position = target->bounds().origin();
   // Drag further than work_area bottom.
   DragFromCenterBy(target.get(), 100, work_area.height());
   // Position should not have changed.
   EXPECT_EQ(position, target->bounds().origin());
   // Size should have increased by 100, work_area.height() - target->bounds.y()
   EXPECT_EQ(gfx::Size(200, work_area.height() - target->bounds().y()),
             target->bounds().size());
 }
 
 TEST_F(ToplevelWindowEventHandlerTest, BottomLeftWorkArea) {
   scoped_ptr<aura::Window> target(CreateWindow(HTBOTTOMLEFT));
-  gfx::Rect work_area =
-      gfx::Screen::GetDisplayNearestWindow(target.get()).work_area();
+  gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow(
+      target.get()).work_area();
   gfx::Point position = target->bounds().origin();
   // Drag further than work_area bottom.
   DragFromCenterBy(target.get(), -30, work_area.height());
   // origin is now at 70, 100.
   EXPECT_EQ(position.x() - 30, target->bounds().x());
   EXPECT_EQ(position.y(), target->bounds().y());
   // Size should have increased by 30, work_area.height() - target->bounds.y()
   EXPECT_EQ(gfx::Size(130, work_area.height() - target->bounds().y()),
             target->bounds().size());
 }
 
 TEST_F(ToplevelWindowEventHandlerTest, BottomWorkArea) {
   scoped_ptr<aura::Window> target(CreateWindow(HTBOTTOM));
-  gfx::Rect work_area =
-      gfx::Screen::GetDisplayNearestWindow(target.get()).work_area();
+  gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow(
+      target.get()).work_area();
   gfx::Point position = target->bounds().origin();
   // Drag further than work_area bottom.
   DragFromCenterBy(target.get(), 0, work_area.height());
   // Position should not have changed.
   EXPECT_EQ(position, target->bounds().origin());
   // Size should have increased by 0, work_area.height() - target->bounds.y()
   EXPECT_EQ(gfx::Size(100, work_area.height() - target->bounds().y()),
             target->bounds().size());
 }
 
 // Verifies we don't let windows drag to a -y location.
 TEST_F(ToplevelWindowEventHandlerTest, DontDragToNegativeY) {
   scoped_ptr<aura::Window> target(CreateWindow(HTTOP));
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                        target.get());
   generator.MoveMouseTo(0, 5);
   generator.DragMouseBy(0, -5);
   // The y location and height should not have changed.
   EXPECT_EQ(0, target->bounds().y());
   EXPECT_EQ(100, target->bounds().height());
 }
 
 // Verifies we don't let windows go bigger than the display width.
 TEST_F(ToplevelWindowEventHandlerTest, DontGotWiderThanScreen) {
   scoped_ptr<aura::Window> target(CreateWindow(HTRIGHT));
-  gfx::Rect work_area =
-      gfx::Screen::GetDisplayNearestWindow(target.get()).bounds();
+  gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow(
+      target.get()).bounds();
   DragFromCenterBy(target.get(), work_area.width() * 2, 0);
   // The y location and height should not have changed.
   EXPECT_EQ(work_area.width(), target->bounds().width());
 }
 
 // Verifies that touch-gestures drag the window correctly.
 TEST_F(ToplevelWindowEventHandlerTest, GestureDrag) {
   scoped_ptr<aura::Window> target(CreateWindow(HTCAPTION));
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                        target.get());
@@ skipping 81 matching lines @@
 
   EXPECT_EQ("0,0 110x111", target->bounds().ToString());
   generator.PressKey(ui::VKEY_ESCAPE, 0);
   generator.ReleaseKey(ui::VKEY_ESCAPE, 0);
   EXPECT_EQ("0,0 100x100", target->bounds().ToString());
   aura::client::SetActivationClient(root, original_client);
 }
 
 }  // namespace test
 }  // namespace ash