Move many of the Autofill unittests into components_unittests.

components/components_tests.gyp

 # 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.
 
 {
   '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,
    },
   'conditions': [
     ['android_webview_build == 0', {
       'targets': [
         {
           'target_name': 'components_unittests',
           'type': '<(gtest_target_type)',
           'sources': [
             'auto_login_parser/auto_login_parser_unittest.cc',
+            'autofill/core/browser/address_field_unittest.cc',
+            'autofill/core/browser/address_unittest.cc',
+            'autofill/core/browser/android/auxiliary_profile_unittest_android.cc',
+            'autofill/core/browser/autofill_country_unittest.cc',
+            'autofill/core/browser/autofill_data_model_unittest.cc',
+            'autofill/core/browser/autofill_download_url_unittest.cc',
+            'autofill/core/browser/autofill_field_unittest.cc',
+            'autofill/core/browser/autofill_merge_unittest.cc',
+            'autofill/core/browser/autofill_profile_unittest.cc',
+            'autofill/core/browser/autofill_regexes_unittest.cc',
+            'autofill/core/browser/autofill_type_unittest.cc',
+            'autofill/core/browser/autofill_xml_parser_unittest.cc',
+            'autofill/core/browser/contact_info_unittest.cc',
+            'autofill/core/browser/credit_card_field_unittest.cc',
+            'autofill/core/browser/credit_card_unittest.cc',
+            'autofill/core/browser/form_field_unittest.cc',
+            'autofill/core/browser/form_structure_unittest.cc',
+            'autofill/core/browser/password_generator_unittest.cc',
+            'autofill/core/browser/phone_field_unittest.cc',
+            'autofill/core/browser/phone_number_unittest.cc',
+            'autofill/core/browser/phone_number_i18n_unittest.cc',
+            'autofill/core/browser/validation_unittest.cc',
             'autofill/core/browser/webdata/autofill_entry_unittest.cc',
             'autofill/core/browser/webdata/web_data_service_unittest.cc',
             'autofill/core/common/form_data_unittest.cc',
             'autofill/core/common/form_field_data_unittest.cc',
             'autofill/core/common/password_form_fill_data_unittest.cc',
             'browser_context_keyed_service/browser_context_dependency_manager_unittest.cc',
             'browser_context_keyed_service/dependency_graph_unittest.cc',
             'cloud_devices/printer_description_unittest.cc',
             'dom_distiller/core/article_entry_unittest.cc',
             'dom_distiller/core/distiller_unittest.cc',
@@ skipping 60 matching lines @@
             'encryptor/encryptor_unittest.cc',
             'encryptor/ie7_password_unittest_win.cc',
             'web_modal/web_contents_modal_dialog_manager_unittest.cc',
           ],
           'include_dirs': [
             '..',
           ],
           'dependencies': [
             '../base/base.gyp:base_prefs_test_support',
             '../base/base.gyp:test_support_base',
+            # TODO(blundell): Create a bug for eliminating the need for this
+            # and reference the bug here.
+            '../chrome/chrome_resources.gyp:packed_extra_resources',
             # TODO(blundell): Eliminate the need for this dependency in code
             # that iOS shares. crbug.com/325243
             '../content/content_shell_and_tests.gyp:test_support_content',
             '../sync/sync.gyp:sync',
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/ui.gyp:ui',
 
             # Dependencies of auto_login_parser
             'components.gyp:auto_login_parser',
 
             # Dependencies of autofill
             'components.gyp:autofill_core_browser',
             'components.gyp:autofill_core_common',
             'components.gyp:autofill_core_test_support',
+            'component_strings.gyp:component_strings',
+            '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
 
             # Dependencies of cloud_devices
             'components.gyp:cloud_devices',
 
             # Dependencies of dom_distiller
             'components.gyp:distilled_page_proto',
             'components.gyp:dom_distiller_core',
             'components.gyp:dom_distiller_test_support',
 
             # Dependencies of encryptor
@@ skipping 26 matching lines @@
             'components.gyp:translate_core_browser',
             'components.gyp:translate_core_common',
             'components.gyp:translate_language_detection',
 
             # Dependencies of variations
             'components.gyp:variations',
           ],
           'conditions': [
             ['OS != "ios"', {
               'dependencies': [
+                # Dependencies of autofill/core/browser/credit_card_unittest.cc.
+                # TODO(blundell): Eliminate the need for this conditional
+                # dependence. crbug.com/328150
+                '../webkit/webkit_resources.gyp:webkit_resources',
+                
                 # Dependencies of browser_context_keyed_service
                 'components.gyp:browser_context_keyed_service',
 
                 # Dependencies of
                 # intercept_navigation_resource_throttle_unittest.cc
                 '../skia/skia.gyp:skia',
                 'components.gyp:navigation_interception',
 
                 # Dependencies of precache/content
                 'components.gyp:precache_content',
@@ skipping 57 matching lines @@
                 'nacl/browser/pnacl_host_unittest.cc',
                 'nacl/browser/pnacl_translation_cache_unittest.cc',
                 'nacl/browser/test_nacl_browser_delegate.cc',
               ],
               'dependencies': [
                 'nacl.gyp:nacl_browser',
                 'nacl.gyp:nacl_common',
               ],
             }],
             ['OS == "mac"', {
+              'dependencies': [
+                # TODO(blundell): Create a bug for eliminating the need for this
+                # and reference the bug here.
+                '../chrome/chrome.gyp:common',
+              ],
               'link_settings': {
                 'libraries': [
                   '$(SDKROOT)/System/Library/Frameworks/AddressBook.framework',
                   '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
                   '$(SDKROOT)/System/Library/Frameworks/ImageCaptureCore.framework',
                 ],
               },
               'sources!': [
                 'password_manager/core/browser/password_store_default_unittest.cc',
               ],
@@ skipping 236 matching lines @@
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }