macviews: default cocoa tests to Cocoa browser windows

The bulk of these tests depend on having a Cocoa browser window and the
related infrastructure.

Bug: 834754
Change-Id: I304222489cf28fb8e69914f24ae646198aeca352
Reviewed-on: https://chromium-review.googlesource.com/1050194
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Leonard Grey <lgrey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557215}

chrome/browser/ui/BUILD.gn

@@ -3938,6 +3938,8 @@ static_library("test_support") {
   if (toolkit_views) {
     deps += [ "//ui/views:test_support" ]
     sources += [
+      "../../test/views/scoped_macviews_browser_mode.cc",
+      "../../test/views/scoped_macviews_browser_mode.h",
       "extensions/browser_action_test_util.h",
       "views/payments/test_chrome_payment_request_delegate.cc",
       "views/payments/test_chrome_payment_request_delegate.h",

chrome/browser/ui/cocoa/test/cocoa_test_helper.h

@@ -7,6 +7,7 @@
 
 #import <Cocoa/Cocoa.h>
 
+#include "chrome/test/views/scoped_macviews_browser_mode.h"
 #import "ui/base/test/cocoa_helper.h"
 
 // A test class that all tests that depend on AppKit should inherit from.
@@ -25,6 +26,9 @@ class CocoaTest : public ui::CocoaTest {
   static void BootstrapCocoa();
 
   CocoaTest();
+
+ private:
+  test::ScopedMacViewsBrowserMode cocoa_mode_{false};
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_TEST_COCOA_TEST_HELPER_H_

chrome/test/BUILD.gn

@@ -258,8 +258,6 @@ static_library("test_support") {
       "views/chrome_test_views_delegate.h",
       "views/chrome_views_test_base.cc",
       "views/chrome_views_test_base.h",
-      "views/scoped_macviews_browser_mode.cc",
-      "views/scoped_macviews_browser_mode.h",
     ]
     if (is_mac) {
       sources +=