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

chrome/browser/ui/panels/panel_and_desktop_notification_browsertest.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 "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/balloon_collection_impl.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/notification.h"
@@ skipping 65 matching lines @@
           params, 0, 0, DesktopNotificationService::PageNotification));
     MessageLoopForUI::current()->RunAllPending();
     return balloons().front();
   }
 
   static int GetBalloonBottomPosition(Balloon* balloon) {
 #if defined(OS_MACOSX)
     // The position returned by the notification balloon is based on Mac's
     // vertically inverted orientation. We need to flip it so that it can
     // be compared against the position returned by the panel.
-    gfx::Size screen_size = gfx::Screen::GetPrimaryDisplay().size();
+    gfx::Size screen_size =
+        gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().size();
     return screen_size.height() - balloon->GetPosition().y();
 #else
     return balloon->GetPosition().y() + balloon->GetViewSize().height();
 #endif
   }
 
   static void DragPanelToMouseLocation(Panel* panel,
                                        const gfx::Point& new_mouse_location) {
     PanelManager* panel_manager = PanelManager::GetInstance();
     panel_manager->StartDragging(panel, panel->GetBounds().origin());
@@ skipping 295 matching lines @@
   MessageLoopForUI::current()->RunAllPending();
   EXPECT_EQ(balloon_bottom_after_short_panel_created,
             GetBalloonBottomPosition(balloon));
 
   // Close short panel. Expect that the notification balloo moves back to its
   // original position.
   short_panel->Close();
   MessageLoopForUI::current()->RunAllPending();
   EXPECT_EQ(original_balloon_bottom, GetBalloonBottomPosition(balloon));
 }