Fix browser tests on Mac

headless/lib/headless_browser_browsertest.cc

Index: headless/lib/headless_browser_browsertest.cc
diff --git a/headless/lib/headless_browser_browsertest.cc b/headless/lib/headless_browser_browsertest.cc
index 6b0b3b846f720e909b18a64d995745c9a471fc16..e3342bd66bd3571360e2724fa1799d8b5da70670 100644
--- a/headless/lib/headless_browser_browsertest.cc
+++ b/headless/lib/headless_browser_browsertest.cc
@@ -353,11 +353,14 @@ IN_PROC_BROWSER_TEST_F(HeadlessBrowserTest, DefaultSizes) {
   HeadlessBrowser::Options::Builder builder;
   const HeadlessBrowser::Options kDefaultOptions = builder.Build();
 
-  int screen_width;
-  int screen_height;
   int window_width;
   int window_height;
 
+#if !defined(OS_MACOSX)
+  // There is no concept of screen on Mac, so this part of the test should

[Sami, 2017/03/28 13:11:59]

Would it be more accurate to say we don't override the size of the screen in
headless mode on Mac, so this returns the actual screen dimensions.

nit: Let's leave the query in but just #ifdef out the EXPECT_EQ part.

[dvallet, 2017/03/29 05:16:27]

Done. Yes, that's more accurate, thanks!

+  // not run.
+  int screen_width;
+  int screen_height;
   EXPECT_TRUE(EvaluateScript(web_contents, "screen.width")
                   ->GetResult()
                   ->GetValue()
@@ -366,6 +369,9 @@ IN_PROC_BROWSER_TEST_F(HeadlessBrowserTest, DefaultSizes) {
                   ->GetResult()
                   ->GetValue()
                   ->GetAsInteger(&screen_height));
+  EXPECT_EQ(kDefaultOptions.window_size.width(), screen_width);
+  EXPECT_EQ(kDefaultOptions.window_size.height(), screen_height);
+#endif  // !defined(OS_MACOSX)
   EXPECT_TRUE(EvaluateScript(web_contents, "window.innerWidth")
                   ->GetResult()
                   ->GetValue()
@@ -375,8 +381,6 @@ IN_PROC_BROWSER_TEST_F(HeadlessBrowserTest, DefaultSizes) {
                   ->GetValue()
                   ->GetAsInteger(&window_height));
 
-  EXPECT_EQ(kDefaultOptions.window_size.width(), screen_width);
-  EXPECT_EQ(kDefaultOptions.window_size.height(), screen_height);
   EXPECT_EQ(kDefaultOptions.window_size.width(), window_width);
   EXPECT_EQ(kDefaultOptions.window_size.height(), window_height);
 }