[WebPayments] Enabling unit + browser tests on Mac

chrome/test/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/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
@@ skipping 559 matching lines @@
           "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h",
           "../browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc",
           "../browser/ui/views/toolbar/toolbar_button_interactive_uitest.cc",
           "../browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc",
           "../browser/ui/views/translate/translate_bubble_test_utils_views.cc",
           "../browser/ui/views/website_settings/website_settings_popup_view_interactive_uitest.cc",
           "base/interactive_test_utils_views.cc",
         ]
       }
       if (is_win || is_linux) {
-        # TODO(crbug.com/679127): Enable these tests on "mac_views_browser" once
-        # it is supported.
+        # TODO(crbug.com/679127): Investigate why these tests currently break
+        # on Mac, and enable them.
         sources += [
           "../browser/ui/views/payments/payment_request_credit_card_editor_interactive_uitest.cc",
           "../browser/ui/views/payments/payment_request_interactive_uitest.cc",
           "../browser/ui/views/payments/payment_request_interactive_uitest_base.cc",
           "../browser/ui/views/payments/payment_request_interactive_uitest_base.h",
         ]
       }
       if (is_linux) {
         if (!is_chromeos) {
           # Desktop linux.
@@ skipping 1415 matching lines @@
 
     if (!is_mac) {
       data += [
         "$root_out_dir/locales/",
         "$root_out_dir/chrome_100_percent.pak",
         "$root_out_dir/chrome_200_percent.pak",
         "$root_out_dir/resources.pak",
       ]
     }
 
-    # TODO(crbug.com/679127): Enable these tests on "mac_views_browser" once it
-    # is supported.
-    if (is_linux || is_win) {
-      sources +=
-          [ "../browser/payments/site_per_process_payments_browsertest.cc" ]
-    }
-
     if (enable_captive_portal_detection) {
       sources +=
           [ "../browser/ssl/captive_portal_blocking_page_browsertest.cc" ]
     }
     if (!enable_one_click_signin) {
       sources -= [ "../browser/ui/sync/one_click_signin_links_delegate_impl_browsertest.cc" ]
     }
     if (enable_nacl) {
       sources += [
         "../browser/chrome_service_worker_browsertest.cc",
@@ skipping 102 matching lines @@
 
       if (enable_app_list) {
         deps += [ ":test_support_applist_ash" ]
       }
     }
     if (use_aura || toolkit_views) {
       deps += [ "//ui/events:test_support" ]
     }
     if (toolkit_views) {
       sources += [
+        "../browser/payments/site_per_process_payments_browsertest.cc",
         "../browser/ui/global_error/global_error_service_browsertest.cc",
         "../browser/ui/views/external_protocol_dialog_browsertest.cc",
         "../browser/ui/views/frame/browser_non_client_frame_view_browsertest_win.cc",
         "../browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc",
         "../browser/ui/views/location_bar/content_setting_bubble_dialog_browsertest.cc",
         "../browser/ui/views/select_file_dialog_extension_browsertest.cc",
         "../browser/ui/views/sync/profile_signin_confirmation_dialog_views_browsertest.cc",
       ]
       deps += [ "//ui/views" ]
       if (!is_chromeos && (!is_mac || mac_views_browser)) {
@@ skipping 2654 matching lines @@
       "//components/web_modal:test_support",
       "//ui/views",
       "//ui/views:test_support",
     ]
     sources += [
       "../../ui/views/controls/webview/webview_unittest.cc",
       "../browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc",
       "../browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc",
       "../browser/ui/views/confirm_bubble_views_unittest.cc",
       "../browser/ui/views/global_error_bubble_view_unittest.cc",
+      "../browser/ui/views/payments/credit_card_editor_view_controller_unittest.cc",
+      "../browser/ui/views/payments/validating_textfield_unittest.cc",
+      "../browser/ui/views/payments/view_stack_unittest.cc",
       "../browser/ui/views/website_settings/website_settings_popup_view_unittest.cc",
     ]
     if (is_chromeos) {
       sources += [ "../browser/ui/views/ime_driver/input_method_bridge_chromeos_unittest.cc" ]
     }
     if (!is_chromeos && (!is_mac || mac_views_browser)) {
       sources += [
         "../browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc",
         "../browser/ui/views/sync/one_click_signin_dialog_view_unittest.cc",
       ]
@@ skipping 12 matching lines @@
         "../browser/ui/views/extensions/chooser_dialog_view_unittest.cc",
         "../browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc",
         "../browser/ui/views/frame/browser_non_client_frame_view_unittest.cc",
         "../browser/ui/views/frame/browser_view_layout_unittest.cc",
         "../browser/ui/views/frame/browser_view_unittest.cc",
         "../browser/ui/views/frame/test_with_browser_view.cc",
         "../browser/ui/views/frame/test_with_browser_view.h",
         "../browser/ui/views/frame/web_contents_close_handler_unittest.cc",
         "../browser/ui/views/location_bar/icon_label_bubble_view_unittest.cc",
         "../browser/ui/views/omnibox/omnibox_view_views_unittest.cc",
-        "../browser/ui/views/payments/credit_card_editor_view_controller_unittest.cc",
-        "../browser/ui/views/payments/validating_textfield_unittest.cc",
-        "../browser/ui/views/payments/view_stack_unittest.cc",
         "../browser/ui/views/status_icons/status_tray_win_unittest.cc",
         "../browser/ui/views/sync/bubble_sync_promo_view_unittest.cc",
         "../browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_unittest.cc",
         "../browser/ui/views/tabs/alert_indicator_button_unittest.cc",
         "../browser/ui/views/tabs/fake_base_tab_strip_controller.cc",
         "../browser/ui/views/tabs/fake_base_tab_strip_controller.h",
         "../browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc",
         "../browser/ui/views/tabs/tab_strip_layout_unittest.cc",
         "../browser/ui/views/tabs/tab_strip_unittest.cc",
         "../browser/ui/views/tabs/tab_unittest.cc",
@@ skipping 326 matching lines @@
 }
 
 if (is_win) {
   loadable_module("conflicts_dll") {
     testonly = true
     sources = [
       "conflicts/conflicts_dll.cc",
     ]
   }
 }