[WebPayments] Enabling unit + browser tests on Mac

chrome/test/BUILD.gn

Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index ec513c1744853230ffdd9fd1616838555f388c86..65f9c04095e32d09b415501f35b6a8ff94df33e6 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -577,8 +577,8 @@ if (!is_android) {
         ]
       }
       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",
@@ -2014,13 +2014,6 @@ test("browser_tests") {
       ]
     }
 
-    # 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" ]
@@ -2143,6 +2136,7 @@ test("browser_tests") {
     }
     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",
@@ -4817,6 +4811,9 @@ test("unit_tests") {
       "../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) {
@@ -4849,9 +4846,6 @@ test("unit_tests") {
         "../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",