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

ui/gfx/screen_unittest.cc

Index: ui/gfx/screen_unittest.cc
diff --git a/ui/gfx/screen_unittest.cc b/ui/gfx/screen_unittest.cc
index d09f2db8a4a0ad12ab1e043bb3ea70491cf9883c..db5a03ffec90ad987f9886e458d74339c558ef01 100644
--- a/ui/gfx/screen_unittest.cc
+++ b/ui/gfx/screen_unittest.cc
@@ -10,14 +10,15 @@ namespace {
 
 TEST(ScreenTest, GetPrimaryDisplaySize) {
   // We aren't actually testing that it's correct, just that it's sane.
-  const gfx::Size size = gfx::Screen::GetPrimaryDisplay().size();
+  const gfx::Size size =
+      gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().size();
   EXPECT_GE(size.width(), 1);
   EXPECT_GE(size.height(), 1);
 }
 
 TEST(ScreenTest, GetNumDisplays) {
   // We aren't actually testing that it's correct, just that it's sane.
-  EXPECT_GE(gfx::Screen::GetNumDisplays(), 1);
+  EXPECT_GE(gfx::Screen::GetNativeScreen()->GetNumDisplays(), 1);
 }
 
 }  // namespace