[WebPayments] Enabling unit + browser tests on Mac

chrome/browser/ui/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/chromecast_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/split_static_library.gni")
 import("//chrome/common/features.gni")
@@ skipping 3470 matching lines @@
     "//content/public/common",
     "//content/test:test_support",
     "//net:test_support",
     "//skia",
     "//testing/gtest",
     "//ui/base",
     "//ui/gfx:test_support",
     "//ui/shell_dialogs",
   ]
 
-  if (toolkit_views && (!is_mac || mac_views_browser)) {
+  if (toolkit_views) {
     sources += [
-      "views/find_bar_host_unittest_util_views.cc",
       "views/payments/test_chrome_payment_request_delegate.cc",
       "views/payments/test_chrome_payment_request_delegate.h",
-      "views/toolbar/browser_action_test_util_views.cc",
     ]
-    if (!is_mac) {
-      deps += [ "//ui/aura" ]
+    if (!is_mac || mac_views_browser) {
+      sources += [
+        "views/find_bar_host_unittest_util_views.cc",
+        "views/toolbar/browser_action_test_util_views.cc",
+      ]
+      if (!is_mac) {
+        deps += [ "//ui/aura" ]
+      }
+    } else {
+      sources += [
+        "cocoa/extensions/browser_action_test_util_mac.mm",
+        "cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm",
+      ]
     }
-  } else {
-    sources += [
-      "cocoa/extensions/browser_action_test_util_mac.mm",
-      "cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm",
-    ]
   }
 
   if (!is_android) {
     sources += [
       "exclusive_access/fullscreen_controller_state_test.cc",
       "exclusive_access/fullscreen_controller_state_test.h",
       "exclusive_access/fullscreen_controller_state_tests.h",
       "exclusive_access/fullscreen_controller_test.cc",
       "exclusive_access/fullscreen_controller_test.h",
       "passwords/manage_passwords_ui_controller_mock.cc",
       "passwords/manage_passwords_ui_controller_mock.h",
       "passwords/password_dialog_controller_mock.cc",
       "passwords/password_dialog_controller_mock.h",
       "passwords/passwords_model_delegate_mock.cc",
       "passwords/passwords_model_delegate_mock.h",
       "test/test_confirm_bubble_model.cc",
       "test/test_confirm_bubble_model.h",
     ]
     deps += [ "//chrome/test:test_support_ui" ]
   }
 
   if (enable_extensions) {
     deps += [ "//extensions/browser" ]
   }
 }