[Payments] Convert interactive tests to browsertests

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 554 matching lines @@
           "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc",
           "../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): Investigate why these tests currently break
-        # on Mac, and enable them.
-        sources += [
-          "../browser/ui/views/payments/payment_method_view_controller_interactive_uitest.cc",
-          "../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",
-          "../browser/ui/views/payments/payment_sheet_view_controller_interactive_uitest.cc",
-        ]
-      }
       if (is_linux) {
         if (!is_chromeos) {
           # Desktop linux.
           sources -= [
             # TODO(port): This times out. Attempts have been made to fix the
             # individual failures, but each time I disable a test from these
             # suites, it seems like one or another starts timing out too.
             "../browser/ui/views/keyboard_access_browsertest.cc",
           ]
           if (!use_ozone) {
@@ skipping 1543 matching lines @@
       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/payments/credit_card_editor_view_controller_browsertest.cc",
+        "../browser/ui/views/payments/payment_method_view_controller_browsertest.cc",
+        "../browser/ui/views/payments/payment_request_browsertest.cc",
+        "../browser/ui/views/payments/payment_request_browsertest_base.cc",
+        "../browser/ui/views/payments/payment_request_browsertest_base.h",
+        "../browser/ui/views/payments/payment_sheet_view_controller_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)) {
         sources += [ "../browser/ui/views/profiles/profile_chooser_view_browsertest.cc" ]
       }
       if (!is_mac || mac_views_browser) {
         sources += [
           # TODO(tapted): Move these to chrome_browser_tests_views_sources when the
@@ skipping 3033 matching lines @@
 }
 
 if (is_win) {
   loadable_module("conflicts_dll") {
     testonly = true
     sources = [
       "conflicts/conflicts_dll.cc",
     ]
   }
 }