Move many of the Autofill unittests into components_unittests.

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index ea83ae60c7c76ba79010459987ca55be26b5be5c..791cb01ea40dc0fcb1fdf104c768fd075628ebd4 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -17,6 +17,28 @@
           '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',
@@ -97,6 +119,9 @@
           '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',
@@ -113,6 +138,8 @@
             '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',
@@ -159,6 +186,11 @@
           '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',
 
@@ -236,6 +268,11 @@
               ],
             }],
             ['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',