Fix ScreenCapturerMacTest to pass on high-DPI hosts

BUG=233395

Review URL: https://chromiumcodereview.appspot.com/14192011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195510 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 6 deletions

diff --git a/media/video/capture/screen/screen_capturer_mac_unittest.cc b/media/video/capture/screen/screen_capturer_mac_unittest.cc
index 9afd7f2..e7c7730 100644
--- a/media/video/capture/screen/screen_capturer_mac_unittest.cc
+++ b/media/video/capture/screen/screen_capturer_mac_unittest.cc
@@ -11,6 +11,7 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
+#include "media/video/capture/screen/mac/desktop_configuration.h"
 #include "media/video/capture/screen/screen_capture_data.h"
 #include "media/video/capture/screen/screen_capturer_mock_objects.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -47,18 +48,21 @@ class ScreenCapturerMacTest : public testing::Test {
 
 void ScreenCapturerMacTest::CaptureDoneCallback1(
     scoped_refptr<ScreenCaptureData> capture_data) {
-  CGDirectDisplayID mainDevice = CGMainDisplayID();
-  int width = CGDisplayPixelsWide(mainDevice);
-  int height = CGDisplayPixelsHigh(mainDevice);
+  MacDesktopConfiguration config = MacDesktopConfiguration::GetCurrent(
+      MacDesktopConfiguration::BottomLeftOrigin);
+  int width = config.pixel_bounds.width();
+  int height = config.pixel_bounds.height();
   SkRegion initial_region(SkIRect::MakeXYWH(0, 0, width, height));
+
   EXPECT_EQ(initial_region, capture_data->dirty_region());
 }
 
 void ScreenCapturerMacTest::CaptureDoneCallback2(
     scoped_refptr<ScreenCaptureData> capture_data) {
-  CGDirectDisplayID mainDevice = CGMainDisplayID();
-  int width = CGDisplayPixelsWide(mainDevice);
-  int height = CGDisplayPixelsHigh(mainDevice);
+  MacDesktopConfiguration config = MacDesktopConfiguration::GetCurrent(
+      MacDesktopConfiguration::BottomLeftOrigin);
+  int width = config.pixel_bounds.width();
+  int height = config.pixel_bounds.height();
 
   EXPECT_EQ(region_, capture_data->dirty_region());
   EXPECT_EQ(width, capture_data->size().width());