Fix browser tests on Mac

headless/lib/headless_browser_browsertest.cc

 // Copyright 2016 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 <memory>
 
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/memory/ptr_util.h"
@@ skipping 335 matching lines @@
 IN_PROC_BROWSER_TEST_F(HeadlessBrowserTest, DefaultSizes) {
   HeadlessBrowserContext* browser_context =
       browser()->CreateBrowserContextBuilder().Build();
 
   HeadlessWebContents* web_contents =
       browser_context->CreateWebContentsBuilder().Build();
 
   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()
                   ->GetAsInteger(&screen_width));
   EXPECT_TRUE(EvaluateScript(web_contents, "screen.height")
                   ->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()
                   ->GetAsInteger(&window_width));
   EXPECT_TRUE(EvaluateScript(web_contents, "window.innerHeight")
                   ->GetResult()
                   ->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);
 }
 
 namespace {
 
 // True if the request method is "safe" (per section 4.2.1 of RFC 7231).
 bool IsMethodSafe(const std::string& method) {
   return method == "GET" || method == "HEAD" || method == "OPTIONS" ||
          method == "TRACE";
@@ skipping 357 matching lines @@
 
   web_contents_->RemoveObserver(this);
   web_contents_->Close();
   web_contents_ = nullptr;
 
   browser_context_->Close();
   browser_context_ = nullptr;
 }
 
 }  // namespace headless