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

content/browser/renderer_host/render_widget_host_view_aura.cc

Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index b5905bc84b14a805be1dc43187064e9e22a0845b..e05f629b3531916844b18f111f7c817fd765580d 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -147,7 +147,7 @@ bool CanRendererHandleEvent(const ui::MouseEvent* event) {
 void GetScreenInfoForWindow(WebScreenInfo* results, aura::Window* window) {
   const gfx::Display display = window ?
       gfx::Screen::GetDisplayNearestWindow(window) :
-      gfx::Screen::GetPrimaryDisplay();
+      gfx::Screen::GetPrimaryDisplay(gfx::Screen::BadTwoWorldsContext());
   const gfx::Size size = display.size();
   results->rect = WebKit::WebRect(0, 0, size.width(), size.height());
   results->availableRect = results->rect;
@@ -1703,7 +1703,8 @@ RenderWidgetHostViewAura::~RenderWidgetHostViewAura() {
 }
 
 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() {
-  const gfx::Point screen_point = gfx::Screen::GetCursorScreenPoint();
+  const gfx::Point screen_point = gfx::Screen::GetCursorScreenPoint(
+      gfx::Screen::BadTwoWorldsContext());
   aura::RootWindow* root_window = window_->GetRootWindow();
   if (!root_window)
     return;