Move the Google Payments URL functions out of content.

components/autofill.gypi

 # Copyright (c) 2013 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.
 
 {
   'targets': [
     {
       # GN version: //components/autofill/core/common
       'target_name': 'autofill_core_common',
       'type': 'static_library',
@@ skipping 164 matching lines @@
         'autofill/core/browser/legal_message_line.h',
         'autofill/core/browser/name_field.cc',
         'autofill/core/browser/name_field.h',
         'autofill/core/browser/password_generator.cc',
         'autofill/core/browser/password_generator.h',
         'autofill/core/browser/payments/full_card_request.cc',
         'autofill/core/browser/payments/full_card_request.h',
         'autofill/core/browser/payments/payments_client.cc',
         'autofill/core/browser/payments/payments_client.h',
         'autofill/core/browser/payments/payments_request.h',
+        'autofill/core/browser/payments/payments_service_url.cc',
+        'autofill/core/browser/payments/payments_service_url.h',
         'autofill/core/browser/personal_data_manager.cc',
         'autofill/core/browser/personal_data_manager.h',
         'autofill/core/browser/personal_data_manager_observer.h',
         'autofill/core/browser/phone_field.cc',
         'autofill/core/browser/phone_field.h',
         'autofill/core/browser/phone_number.cc',
         'autofill/core/browser/phone_number.h',
         'autofill/core/browser/phone_number_i18n.cc',
         'autofill/core/browser/phone_number_i18n.h',
         'autofill/core/browser/popup_item_ids.h',
@@ skipping 181 matching lines @@
           'sources': [
             'autofill/content/browser/risk/proto/fingerprint.proto',
           ],
           'variables': {
             'proto_in_dir': 'autofill/content/browser/risk/proto',
             'proto_out_dir': 'components/autofill/content/browser/risk/proto',
           },
           'includes': [ '../build/protoc.gypi' ]
         },
        {
-         # GN version: //components/autofill/content/browser/wallet:test_support
          # GN version: //components/autofill/content/renderer:test_support
          'target_name': 'autofill_content_test_support',
          'type': 'static_library',
          'dependencies': [
            'autofill_content_browser',
            'autofill_content_renderer',
            '../base/base.gyp:base',
            '../ipc/ipc.gyp:ipc',
            '../skia/skia.gyp:skia',
            '../testing/gmock.gyp:gmock',
@@ skipping 44 matching lines @@
             'user_prefs',
             'webdata_common',
           ],
           'sources': [
             'autofill/content/browser/content_autofill_driver.cc',
             'autofill/content/browser/content_autofill_driver.h',
             'autofill/content/browser/content_autofill_driver_factory.cc',
             'autofill/content/browser/content_autofill_driver_factory.h',
             'autofill/content/browser/risk/fingerprint.cc',
             'autofill/content/browser/risk/fingerprint.h',
-            'autofill/content/browser/wallet/wallet_service_url.cc',
-            'autofill/content/browser/wallet/wallet_service_url.h',
           ],
 
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
           # This is needed because GYP's handling of transitive dependencies is
           # not great. See https://goo.gl/QGtlae for details.
           'export_dependent_settings': [
             'autofill_server_proto',
           ],
         },
@@ skipping 99 matching lines @@
             ],
           },
           'includes': [
             '../ios/web/js_compile_checked.gypi',
           ],
         },
       ],
     }],
   ],
 }