Move the Google Payments URL functions out of content.

components/components_tests.gyp

  # 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.
 
 {
   'variables': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
 
     # Note: sources list duplicated in GN build. In the GN build,
     # each component has its own unit tests target defined in its
     # directory that are then linked into the final components_unittests.
     'auto_login_parser_unittest_sources': [
       'auto_login_parser/auto_login_parser_unittest.cc',
     ],
     'autofill_unittest_sources': [
       'autofill/content/browser/content_autofill_driver_unittest.cc',
-      'autofill/content/browser/wallet/payments_client_unittest.cc',
-      'autofill/content/browser/wallet/wallet_service_url_unittest.cc',
+      'autofill/content/browser/payments/payments_client_unittest.cc',
       'autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc',
       'autofill/core/browser/address_field_unittest.cc',
       'autofill/core/browser/address_i18n_unittest.cc',
       'autofill/core/browser/address_unittest.cc',
       'autofill/core/browser/autocomplete_history_manager_unittest.cc',
       'autofill/core/browser/autofill_country_unittest.cc',
       'autofill/core/browser/autofill_data_model_unittest.cc',
       'autofill/core/browser/autofill_data_util_unittest.cc',
       'autofill/core/browser/autofill_download_manager_unittest.cc',
       'autofill/core/browser/autofill_external_delegate_unittest.cc',
       'autofill/core/browser/autofill_field_unittest.cc',
       'autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc',
       'autofill/core/browser/autofill_manager_unittest.cc',
       'autofill/core/browser/autofill_merge_unittest.cc',
       'autofill/core/browser/autofill_metrics_unittest.cc',
       'autofill/core/browser/autofill_profile_unittest.cc',
       'autofill/core/browser/autofill_type_unittest.cc',
       'autofill/core/browser/contact_info_unittest.cc',
       'autofill/core/browser/country_names_unittest.cc',
       'autofill/core/browser/credit_card_field_unittest.cc',
       'autofill/core/browser/credit_card_unittest.cc',
       'autofill/core/browser/field_candidates_unittest.cc',
       'autofill/core/browser/form_field_unittest.cc',
       'autofill/core/browser/form_structure_unittest.cc',
       'autofill/core/browser/legal_message_line_unittest.cc',
       'autofill/core/browser/name_field_unittest.cc',
       'autofill/core/browser/password_generator_unittest.cc',
       'autofill/core/browser/payments/full_card_request_unittest.cc',
+      'autofill/core/browser/payments/payments_service_url_unittest.cc',
       'autofill/core/browser/personal_data_manager_unittest.cc',
       'autofill/core/browser/phone_field_unittest.cc',
       'autofill/core/browser/phone_number_i18n_unittest.cc',
       'autofill/core/browser/phone_number_unittest.cc',
       'autofill/core/browser/ui/card_unmask_prompt_controller_impl_unittest.cc',
       'autofill/core/browser/validation_unittest.cc',
       'autofill/core/browser/webdata/autofill_data_type_controller_unittest.cc',
       'autofill/core/browser/webdata/autofill_profile_syncable_service_unittest.cc',
       'autofill/core/browser/webdata/autofill_table_unittest.cc',
       'autofill/core/browser/webdata/autofill_wallet_metadata_syncable_service_unittest.cc',
@@ skipping 1886 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }