Move remaining Autofill code to //components/autofill.

chrome/chrome_browser.gypi

 # Copyright 2012 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': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 154 matching lines @@
         'browser/autocomplete/keyword_provider.cc',
         'browser/autocomplete/keyword_provider.h',
         'browser/autocomplete/search_provider.cc',
         'browser/autocomplete/search_provider.h',
         'browser/autocomplete/shortcuts_provider.cc',
         'browser/autocomplete/shortcuts_provider.h',
         'browser/autocomplete/url_prefix.cc',
         'browser/autocomplete/url_prefix.h',
         'browser/autocomplete/zero_suggest_provider.cc',
         'browser/autocomplete/zero_suggest_provider.h',
-        'browser/autofill/address.cc',
-        'browser/autofill/address.h',
-        'browser/autofill/address_field.cc',
-        'browser/autofill/address_field.h',
         'browser/autofill/android/personal_data_manager_android.cc',
         'browser/autofill/android/personal_data_manager_android.h',
-        'browser/autofill/autocheckout/whitelist_manager.cc',
-        'browser/autofill/autocheckout/whitelist_manager.h',
-        'browser/autofill/autocheckout_manager.cc',
-        'browser/autofill/autocheckout_manager.h',
-        'browser/autofill/autocheckout_page_meta_data.cc',
-        'browser/autofill/autocheckout_page_meta_data.h',
-        'browser/autofill/autocomplete_history_manager.cc',
-        'browser/autofill/autocomplete_history_manager.h',
-        'browser/autofill/autofill-inl.h',
         'browser/autofill/autofill_cc_infobar_delegate.cc',
         'browser/autofill/autofill_cc_infobar_delegate.h',
-        'browser/autofill/autofill_country.cc',
-        'browser/autofill/autofill_country.h',
-        'browser/autofill/autofill_download.cc',
-        'browser/autofill/autofill_download.h',
-        'browser/autofill/autofill_download_url.cc',
-        'browser/autofill/autofill_download_url.h',
-        'browser/autofill/autofill_external_delegate.cc',
-        'browser/autofill/autofill_external_delegate.h',
-        'browser/autofill/autofill_field.cc',
-        'browser/autofill/autofill_field.h',
-        'browser/autofill/autofill_ie_toolbar_import_win.cc',
-        'browser/autofill/autofill_ie_toolbar_import_win.h',
-        'browser/autofill/autofill_manager.cc',
-        'browser/autofill/autofill_manager.h',
-        'browser/autofill/autofill_manager_delegate.h',
-        'browser/autofill/autofill_metrics.cc',
-        'browser/autofill/autofill_metrics.h',
-        'browser/autofill/autofill_popup_delegate.h',
-        'browser/autofill/autofill_profile.cc',
-        'browser/autofill/autofill_profile.h',
-        'browser/autofill/autofill_regex_constants.cc.utf8',
-        'browser/autofill/autofill_regex_constants.h',
-        'browser/autofill/autofill_regexes.cc',
-        'browser/autofill/autofill_regexes.h',
-        'browser/autofill/autofill_scanner.cc',
-        'browser/autofill/autofill_scanner.h',
-        'browser/autofill/autofill_server_field_info.h',
-        'browser/autofill/autofill_type.cc',
-        'browser/autofill/autofill_type.h',
-        'browser/autofill/autofill_xml_parser.cc',
-        'browser/autofill/autofill_xml_parser.h',
-        'browser/autofill/contact_info.cc',
-        'browser/autofill/contact_info.h',
-        'browser/autofill/credit_card.cc',
-        'browser/autofill/credit_card.h',
-        'browser/autofill/credit_card_field.cc',
-        'browser/autofill/credit_card_field.h',
-        'browser/autofill/email_field.cc',
-        'browser/autofill/email_field.h',
-        'browser/autofill/field_types.h',
-        'browser/autofill/form_field.cc',
-        'browser/autofill/form_field.h',
-        'browser/autofill/form_group.cc',
-        'browser/autofill/form_group.h',
-        'browser/autofill/form_structure.cc',
-        'browser/autofill/form_structure.h',
-        'browser/autofill/name_field.cc',
-        'browser/autofill/name_field.h',
-        'browser/autofill/password_autofill_manager.cc',
-        'browser/autofill/password_autofill_manager.h',
-        'browser/autofill/password_generator.cc',
-        'browser/autofill/password_generator.h',
-        'browser/autofill/personal_data_manager.cc',
-        'browser/autofill/personal_data_manager.h',
         'browser/autofill/personal_data_manager_factory.cc',
         'browser/autofill/personal_data_manager_factory.h',
-        'browser/autofill/personal_data_manager_mac.mm',
-        'browser/autofill/personal_data_manager_observer.h',
-        'browser/autofill/phone_field.cc',
-        'browser/autofill/phone_field.h',
-        'browser/autofill/phone_number.cc',
-        'browser/autofill/phone_number.h',
-        'browser/autofill/phone_number_i18n.cc',
-        'browser/autofill/phone_number_i18n.h',
-        'browser/autofill/risk/fingerprint.cc',
-        'browser/autofill/risk/fingerprint.h',
-        'browser/autofill/validation.cc',
-        'browser/autofill/validation.h',
-        'browser/autofill/wallet/cart.cc',
-        'browser/autofill/wallet/cart.h',
-        'browser/autofill/wallet/encryption_escrow_client.cc',
-        'browser/autofill/wallet/encryption_escrow_client.h',
-        'browser/autofill/wallet/encryption_escrow_client_observer.h',
-        'browser/autofill/wallet/full_wallet.cc',
-        'browser/autofill/wallet/full_wallet.h',
-        'browser/autofill/wallet/instrument.cc',
-        'browser/autofill/wallet/instrument.h',
-        'browser/autofill/wallet/required_action.cc',
-        'browser/autofill/wallet/required_action.h',
-        'browser/autofill/wallet/wallet_address.cc',
-        'browser/autofill/wallet/wallet_address.h',
-        'browser/autofill/wallet/wallet_client.cc',
-        'browser/autofill/wallet/wallet_client.h',
-        'browser/autofill/wallet/wallet_client_observer.h',
-        'browser/autofill/wallet/wallet_items.cc',
-        'browser/autofill/wallet/wallet_items.h',
-        'browser/autofill/wallet/wallet_service_url.cc',
-        'browser/autofill/wallet/wallet_service_url.h',
         'browser/auto_launch_trial.cc',
         'browser/auto_launch_trial.h',
         'browser/automation/automation_browser_tracker.cc',
         'browser/automation/automation_browser_tracker.h',
         'browser/automation/automation_event_observers.cc',
         'browser/automation/automation_event_observers.h',
         'browser/automation/automation_event_observers_chromeos.cc',
         'browser/automation/automation_event_queue.cc',
         'browser/automation/automation_event_queue.h',
         'browser/automation/automation_provider.cc',
@@ skipping 776 matching lines @@
         'browser/media_galleries/win/mtp_device_delegate_impl_win.h',
         'browser/media_galleries/win/mtp_device_object_entry.cc',
         'browser/media_galleries/win/mtp_device_object_entry.h',
         'browser/media_galleries/win/mtp_device_object_enumerator.cc',
         'browser/media_galleries/win/mtp_device_object_enumerator.h',
         'browser/media_galleries/win/mtp_device_operations_util.cc',
         'browser/media_galleries/win/mtp_device_operations_util.h',
         'browser/media_galleries/win/portable_device_map_service.cc',
         'browser/media_galleries/win/portable_device_map_service.h',
         'browser/media_galleries/win/snapshot_file_details.cc',
-        'browser/media_galleries/win/snapshot_file_details.h',        
+        'browser/media_galleries/win/snapshot_file_details.h',
         'browser/memory_details.cc',
         'browser/memory_details.h',
         'browser/memory_details_android.cc',
         'browser/memory_details_linux.cc',
         'browser/memory_details_mac.cc',
         'browser/memory_details_win.cc',
         'browser/memory_purger.cc',
         'browser/memory_purger.h',
         'browser/metrics/field_trial_synchronizer.cc',
         'browser/metrics/field_trial_synchronizer.h',
@@ skipping 1188 matching lines @@
         'browser/webdata/web_intents_table.h',
         # These files are needed by page_cycler.cc
         'test/base/test_switches.cc',
         'test/base/test_switches.h',
         'test/base/chrome_process_util.cc',
         'test/base/chrome_process_util.h',
         'test/base/chrome_process_util_mac.cc',
         'test/perf/perf_test.cc',
         'test/perf/perf_test.h',
 
+        # TODO(joi): Move to //components/components.gypi once
+        # remaining dependencies back to //chrome are eliminated.
+        '../components/autofill/browser/address.cc',
+        '../components/autofill/browser/address.h',
+        '../components/autofill/browser/address_field.cc',
+        '../components/autofill/browser/address_field.h',
+        '../components/autofill/browser/autocheckout/whitelist_manager.cc',
+        '../components/autofill/browser/autocheckout/whitelist_manager.h',
+        '../components/autofill/browser/autocheckout_manager.cc',
+        '../components/autofill/browser/autocheckout_manager.h',
+        '../components/autofill/browser/autocheckout_page_meta_data.cc',
+        '../components/autofill/browser/autocheckout_page_meta_data.h',
+        '../components/autofill/browser/autocomplete_history_manager.cc',
+        '../components/autofill/browser/autocomplete_history_manager.h',
+        '../components/autofill/browser/autofill-inl.h',
+        '../components/autofill/browser/autofill_country.cc',
+        '../components/autofill/browser/autofill_country.h',
+        '../components/autofill/browser/autofill_download.cc',
+        '../components/autofill/browser/autofill_download.h',
+        '../components/autofill/browser/autofill_download_url.cc',
+        '../components/autofill/browser/autofill_download_url.h',
+        '../components/autofill/browser/autofill_external_delegate.cc',
+        '../components/autofill/browser/autofill_external_delegate.h',
+        '../components/autofill/browser/autofill_field.cc',
+        '../components/autofill/browser/autofill_field.h',
+        '../components/autofill/browser/autofill_ie_toolbar_import_win.cc',
+        '../components/autofill/browser/autofill_ie_toolbar_import_win.h',
+        '../components/autofill/browser/autofill_manager.cc',
+        '../components/autofill/browser/autofill_manager.h',
+        '../components/autofill/browser/autofill_manager_delegate.h',
+        '../components/autofill/browser/autofill_metrics.cc',
+        '../components/autofill/browser/autofill_metrics.h',
+        '../components/autofill/browser/autofill_popup_delegate.h',
+        '../components/autofill/browser/autofill_profile.cc',
+        '../components/autofill/browser/autofill_profile.h',
+        '../components/autofill/browser/autofill_regex_constants.cc.utf8',
+        '../components/autofill/browser/autofill_regex_constants.h',
+        '../components/autofill/browser/autofill_regexes.cc',
+        '../components/autofill/browser/autofill_regexes.h',
+        '../components/autofill/browser/autofill_scanner.cc',
+        '../components/autofill/browser/autofill_scanner.h',
+        '../components/autofill/browser/autofill_server_field_info.h',
+        '../components/autofill/browser/autofill_type.cc',
+        '../components/autofill/browser/autofill_type.h',
+        '../components/autofill/browser/autofill_xml_parser.cc',
+        '../components/autofill/browser/autofill_xml_parser.h',
+        '../components/autofill/browser/contact_info.cc',
+        '../components/autofill/browser/contact_info.h',
+        '../components/autofill/browser/credit_card.cc',
+        '../components/autofill/browser/credit_card.h',
+        '../components/autofill/browser/credit_card_field.cc',
+        '../components/autofill/browser/credit_card_field.h',
+        '../components/autofill/browser/email_field.cc',
+        '../components/autofill/browser/email_field.h',
+        '../components/autofill/browser/field_types.h',
+        '../components/autofill/browser/form_field.cc',
+        '../components/autofill/browser/form_field.h',
+        '../components/autofill/browser/form_group.cc',
+        '../components/autofill/browser/form_group.h',
+        '../components/autofill/browser/form_structure.cc',
+        '../components/autofill/browser/form_structure.h',
+        '../components/autofill/browser/name_field.cc',
+        '../components/autofill/browser/name_field.h',
+        '../components/autofill/browser/password_autofill_manager.cc',
+        '../components/autofill/browser/password_autofill_manager.h',
+        '../components/autofill/browser/password_generator.cc',
+        '../components/autofill/browser/password_generator.h',
+        '../components/autofill/browser/personal_data_manager.cc',
+        '../components/autofill/browser/personal_data_manager.h',
+        '../components/autofill/browser/personal_data_manager_mac.mm',
+        '../components/autofill/browser/personal_data_manager_observer.h',
+        '../components/autofill/browser/phone_field.cc',
+        '../components/autofill/browser/phone_field.h',
+        '../components/autofill/browser/phone_number.cc',
+        '../components/autofill/browser/phone_number.h',
+        '../components/autofill/browser/phone_number_i18n.cc',
+        '../components/autofill/browser/phone_number_i18n.h',
+        '../components/autofill/browser/risk/fingerprint.cc',
+        '../components/autofill/browser/risk/fingerprint.h',
+        '../components/autofill/browser/validation.cc',
+        '../components/autofill/browser/validation.h',
+        '../components/autofill/browser/wallet/cart.cc',
+        '../components/autofill/browser/wallet/cart.h',
+        '../components/autofill/browser/wallet/encryption_escrow_client.cc',
+        '../components/autofill/browser/wallet/encryption_escrow_client.h',
+        '../components/autofill/browser/wallet/encryption_escrow_client_observer.h',
+        '../components/autofill/browser/wallet/full_wallet.cc',
+        '../components/autofill/browser/wallet/full_wallet.h',
+        '../components/autofill/browser/wallet/instrument.cc',
+        '../components/autofill/browser/wallet/instrument.h',
+        '../components/autofill/browser/wallet/required_action.cc',
+        '../components/autofill/browser/wallet/required_action.h',
+        '../components/autofill/browser/wallet/wallet_address.cc',
+        '../components/autofill/browser/wallet/wallet_address.h',
+        '../components/autofill/browser/wallet/wallet_client.cc',
+        '../components/autofill/browser/wallet/wallet_client.h',
+        '../components/autofill/browser/wallet/wallet_client_observer.h',
+        '../components/autofill/browser/wallet/wallet_items.cc',
+        '../components/autofill/browser/wallet/wallet_items.h',
+        '../components/autofill/browser/wallet/wallet_service_url.cc',
+        '../components/autofill/browser/wallet/wallet_service_url.h',
+
         # These files are generated by GRIT.
         '<(grit_out_dir)/grit/component_extension_resources_map.cc',
         '<(grit_out_dir)/grit/devtools_discovery_page_resources_map.cc',
         '<(grit_out_dir)/grit/theme_resources_map.cc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/grit/ui_resources_map.cc',
 
         # This file is generated by the autofill_regexes action.
         '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc',
       ],
       'conditions': [
         ['OS != "ios"', {
           'dependencies': [
             'apps',
-            'autofill_regexes',
-            'autofill_risk_proto',
             'browser/performance_monitor/performance_monitor.gyp:performance_monitor',
             'browser_extensions',
             'common/extensions/api/api.gyp:api',
             'debugger',
             'installer_util',
             'sync_file_system_proto',
             '../cc/cc.gyp:cc',
+            '../components/components.gyp:autofill_regexes',
+            '../components/components.gyp:autofill_risk_proto',
             '../components/components.gyp:navigation_interception',
             '../net/net.gyp:net_with_v8',
             '../printing/printing.gyp:printing',
             '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
             '../third_party/expat/expat.gyp:expat',
             '../third_party/hunspell/hunspell.gyp:hunspell',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
             '../third_party/libusb/libusb.gyp:libusb',
             '../third_party/npapi/npapi.gyp:npapi',
@@ skipping 702 matching lines @@
         ['OS=="android"', {
           'sources/': [
             ['include', '^app/breakpad_linux\\.cc$'],
             ['include', '^browser/crash_handler_host_linux\\.cc$'],
             ['include', '^browser/crash_handler_host_linux_stub\\.cc$'],
           ],
         }],
       ],
     },
     {
-      'target_name': 'autofill_regexes',
-      'type': 'none',
-      'actions': [{
-        'action_name': 'autofill_regexes',
-        'inputs': [
-          '<(DEPTH)/build/escape_unicode.py',
-          'browser/autofill/autofill_regex_constants.cc.utf8',
-        ],
-        'outputs': [
-          '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc',
-        ],
-        'action': ['python', '<(DEPTH)/build/escape_unicode.py',
-                   '-o', '<(SHARED_INTERMEDIATE_DIR)',
-                   'browser/autofill/autofill_regex_constants.cc.utf8'],
-      }],
-    },
-    {
-      # Protobuf compiler / generate rule for Autofill's risk integration.
-      'target_name': 'autofill_risk_proto',
-      'type': 'static_library',
-      'sources': [
-        'browser/autofill/risk/proto/fingerprint.proto',
-      ],
-      'variables': {
-        'proto_in_dir': 'browser/autofill/risk/proto',
-        'proto_out_dir': 'chrome/browser/autofill/risk/proto',
-      },
-      'includes': [ '../build/protoc.gypi' ]
-    },
-    {
       # Protobuf compiler / generator for the fraudulent certificate reporting
       # protocol buffer.
       'target_name': 'cert_logger_proto',
       'type': 'static_library',
       'sources': [ 'browser/net/cert_logger.proto', ],
       'variables': {
         'proto_in_dir': 'browser/net',
         'proto_out_dir': 'chrome/browser/net',
       },
       'includes': [ '../build/protoc.gypi', ],
@@ skipping 123 matching lines @@
             'package_name': 'org/chromium/chrome/browser/ui/toolbar',
             'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }