Build Autofill component on iOS.

This change builds the core code of //component/autofill as well as its core
unittests on iOS. The iOS driver of the Autofill component will be landed at a
later date.

BUG=302428,303079
TBR=joi@chromium.org

Review URL: https://codereview.chromium.org/108013004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240504 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 239 insertions, 219 deletions

diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt
index b374986..d2f832f 100644
--- a/build/ios/grit_whitelist.txt
+++ b/build/ios/grit_whitelist.txt
@@ -99,6 +99,7 @@ IDS_APP_LAUNCHER_OPEN_IN_LABEL_MOBILE
 IDS_APP_LAUNCHER_OPEN_ONCE_BUTTON_MOBILE
 IDS_APP_UNTITLED_SHORTCUT_FILE_NAME
 IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION
+IDS_AUTOFILL_ADDRESS_LINE_SEPARATOR
 IDS_AUTOFILL_ADDRESS_SUMMARY_SEPARATOR
 IDS_AUTOFILL_CC_AMEX
 IDS_AUTOFILL_CC_DINERS
diff --git a/components/autofill.gypi b/components/autofill.gypi
index 03a18ac..2bf7d45 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -22,63 +22,226 @@
                    'autofill/core/browser/autofill_regex_constants.cc.utf8'],
       }],
     },
-  ],
-  'conditions': [
-    ['OS != "ios"', {
-      'targets': [
-        {
-          'target_name': 'autofill_core_common',
-          'type': 'static_library',
+    
+    {
+      'target_name': 'autofill_core_common',
+      'type': 'static_library',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../ui/gfx/gfx.gyp:gfx',
+        '../ui/ui.gyp:ui',
+        '../url/url.gyp:url_lib',
+      ],
+      'conditions': [
+        ['OS == "android"', {
           'dependencies': [
-            '../base/base.gyp:base',
-            '../ui/gfx/gfx.gyp:gfx',
-            '../ui/ui.gyp:ui',
-            '../url/url.gyp:url_lib',
+            'autofill_jni_headers',
           ],
-          'conditions': [
-            ['OS == "android"', {
-              'dependencies': [
-                'autofill_jni_headers',
-              ],
-            }],
-          ],
-          'include_dirs': [
-            '..',
-            '<(SHARED_INTERMEDIATE_DIR)/autofill',
-          ],
-          'sources': [
-            'autofill/core/browser/android/auxiliary_profile_loader_android.cc',
-            'autofill/core/browser/android/auxiliary_profile_loader_android.h',
-            'autofill/core/browser/android/auxiliary_profiles_android.cc',
-            'autofill/core/browser/android/auxiliary_profiles_android.h',
-            'autofill/core/browser/android/component_jni_registrar.cc',
-            'autofill/core/browser/android/component_jni_registrar.h',
-            'autofill/core/browser/android/personal_data_manager_android.cc',
-            'autofill/core/common/autofill_constants.cc',
-            'autofill/core/common/autofill_constants.h',
-            'autofill/core/common/autofill_pref_names.cc',
-            'autofill/core/common/autofill_pref_names.h',
-            'autofill/core/common/autofill_switches.cc',
-            'autofill/core/common/autofill_switches.h',
-            'autofill/core/common/form_data.cc',
-            'autofill/core/common/form_data.h',
-            'autofill/core/common/form_data_predictions.cc',
-            'autofill/core/common/form_data_predictions.h',
-            'autofill/core/common/form_field_data.cc',
-            'autofill/core/common/form_field_data.h',
-            'autofill/core/common/form_field_data_predictions.cc',
-            'autofill/core/common/form_field_data_predictions.h',
-            'autofill/core/common/password_form.cc',
-            'autofill/core/common/password_form.h',
-            'autofill/core/common/password_form_fill_data.cc',
-            'autofill/core/common/password_form_fill_data.h',
-            'autofill/core/common/password_generation_util.cc',
-            'autofill/core/common/password_generation_util.h',
-            'autofill/core/common/web_element_descriptor.cc',
-            'autofill/core/common/web_element_descriptor.h',
+        }],
+      ],
+      'include_dirs': [
+        '..',
+        '<(SHARED_INTERMEDIATE_DIR)/autofill'
+      ],
+      'sources': [
+        'autofill/core/browser/android/auxiliary_profile_loader_android.cc',
+        'autofill/core/browser/android/auxiliary_profile_loader_android.h',
+        'autofill/core/browser/android/auxiliary_profiles_android.cc',
+        'autofill/core/browser/android/auxiliary_profiles_android.h',
+        'autofill/core/browser/android/component_jni_registrar.cc',
+        'autofill/core/browser/android/component_jni_registrar.h',
+        'autofill/core/browser/android/personal_data_manager_android.cc',
+        'autofill/core/common/autofill_constants.cc',
+        'autofill/core/common/autofill_constants.h',
+        'autofill/core/common/autofill_pref_names.cc',
+        'autofill/core/common/autofill_pref_names.h',
+        'autofill/core/common/autofill_switches.cc',
+        'autofill/core/common/autofill_switches.h',
+        'autofill/core/common/form_data.cc',
+        'autofill/core/common/form_data.h',
+        'autofill/core/common/form_data_predictions.cc',
+        'autofill/core/common/form_data_predictions.h',
+        'autofill/core/common/form_field_data.cc',
+        'autofill/core/common/form_field_data.h',
+        'autofill/core/common/form_field_data_predictions.cc',
+        'autofill/core/common/form_field_data_predictions.h',
+        'autofill/core/common/password_form.cc',
+        'autofill/core/common/password_form.h',
+        'autofill/core/common/password_form_fill_data.cc',
+        'autofill/core/common/password_form_fill_data.h',
+        'autofill/core/common/password_generation_util.cc',
+        'autofill/core/common/password_generation_util.h',
+        'autofill/core/common/web_element_descriptor.cc',
+        'autofill/core/common/web_element_descriptor.h',
+      ],
+    },
+
+    {
+      'target_name': 'autofill_core_browser',
+      'type': 'static_library',
+      'include_dirs': [
+        '..',
+      ],
+      'dependencies': [
+        'autofill_core_common',
+        'autofill_regexes',
+        'component_strings.gyp:component_strings',
+        'encryptor',
+        'user_prefs',
+        'webdata_common',
+        '../base/base.gyp:base',
+        '../base/base.gyp:base_i18n',
+        '../base/base.gyp:base_prefs',
+        '../google_apis/google_apis.gyp:google_apis',
+        '../skia/skia.gyp:skia',
+        '../sql/sql.gyp:sql',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
+        '../third_party/libjingle/libjingle.gyp:libjingle',
+        '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
+        '../ui/gfx/gfx.gyp:gfx',
+        '../ui/ui.gyp:ui',
+        '../url/url.gyp:url_lib',
+      ],
+      # TODO(blundell): Eliminate the need for this conditional dependence.
+      # crbug.com/328150
+      'conditions': [
+        ['OS != "ios"', {
+          'dependencies': [
+            '../webkit/webkit_resources.gyp:webkit_resources',
           ],
-        },
+        }],
+      ],
+      'sources': [
+        'autofill/core/browser/address.cc',
+        'autofill/core/browser/address.h',
+        'autofill/core/browser/address_field.cc',
+        'autofill/core/browser/address_field.h',
+        'autofill/core/browser/autocomplete_history_manager.cc',
+        'autofill/core/browser/autocomplete_history_manager.h',
+        'autofill/core/browser/autofill-inl.h',
+        'autofill/core/browser/autofill_country.cc',
+        'autofill/core/browser/autofill_country.h',
+        'autofill/core/browser/autofill_data_model.cc',
+        'autofill/core/browser/autofill_data_model.h',
+        'autofill/core/browser/autofill_download.cc',
+        'autofill/core/browser/autofill_download.h',
+        'autofill/core/browser/autofill_download_url.cc',
+        'autofill/core/browser/autofill_download_url.h',
+        'autofill/core/browser/autofill_driver.h',
+        'autofill/core/browser/autofill_external_delegate.cc',
+        'autofill/core/browser/autofill_external_delegate.h',
+        'autofill/core/browser/autofill_field.cc',
+        'autofill/core/browser/autofill_field.h',
+        'autofill/core/browser/autofill_ie_toolbar_import_win.cc',
+        'autofill/core/browser/autofill_ie_toolbar_import_win.h',
+        'autofill/core/browser/autofill_manager.cc',
+        'autofill/core/browser/autofill_manager.h',
+        'autofill/core/browser/autofill_manager_delegate.h',
+        'autofill/core/browser/autofill_manager_test_delegate.h',
+        'autofill/core/browser/autofill_metrics.cc',
+        'autofill/core/browser/autofill_metrics.h',
+        'autofill/core/browser/autofill_popup_delegate.h',
+        'autofill/core/browser/autofill_profile.cc',
+        'autofill/core/browser/autofill_profile.h',
+        'autofill/core/browser/autofill_regex_constants.cc.utf8',
+        'autofill/core/browser/autofill_regex_constants.h',
+        'autofill/core/browser/autofill_regexes.cc',
+        'autofill/core/browser/autofill_regexes.h',
+        'autofill/core/browser/autofill_scanner.cc',
+        'autofill/core/browser/autofill_scanner.h',
+        'autofill/core/browser/autofill_server_field_info.h',
+        'autofill/core/browser/autofill_type.cc',
+        'autofill/core/browser/autofill_type.h',
+        'autofill/core/browser/autofill_xml_parser.cc',
+        'autofill/core/browser/autofill_xml_parser.h',
+        'autofill/core/browser/contact_info.cc',
+        'autofill/core/browser/contact_info.h',
+        'autofill/core/browser/credit_card.cc',
+        'autofill/core/browser/credit_card.h',
+        'autofill/core/browser/credit_card_field.cc',
+        'autofill/core/browser/credit_card_field.h',
+        'autofill/core/browser/email_field.cc',
+        'autofill/core/browser/email_field.h',
+        'autofill/core/browser/field_types.h',
+        'autofill/core/browser/form_field.cc',
+        'autofill/core/browser/form_field.h',
+        'autofill/core/browser/form_group.cc',
+        'autofill/core/browser/form_group.h',
+        'autofill/core/browser/form_structure.cc',
+        'autofill/core/browser/form_structure.h',
+        'autofill/core/browser/name_field.cc',
+        'autofill/core/browser/name_field.h',
+        'autofill/core/browser/password_autofill_manager.cc',
+        'autofill/core/browser/password_autofill_manager.h',
+        'autofill/core/browser/password_generator.cc',
+        'autofill/core/browser/password_generator.h',
+        'autofill/core/browser/personal_data_manager.cc',
+        'autofill/core/browser/personal_data_manager.h',
+        'autofill/core/browser/personal_data_manager_mac.mm',
+        '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/state_names.cc',
+        'autofill/core/browser/state_names.h',
+        'autofill/core/browser/validation.cc',
+        'autofill/core/browser/validation.h',
+        'autofill/core/browser/webdata/autofill_change.cc',
+        'autofill/core/browser/webdata/autofill_change.h',
+        'autofill/core/browser/webdata/autofill_entry.cc',
+        'autofill/core/browser/webdata/autofill_entry.h',
+        'autofill/core/browser/webdata/autofill_table.cc',
+        'autofill/core/browser/webdata/autofill_table.h',
+        'autofill/core/browser/webdata/autofill_webdata.h',
+        'autofill/core/browser/webdata/autofill_webdata_backend.h',
+        'autofill/core/browser/webdata/autofill_webdata_backend_impl.cc',
+        'autofill/core/browser/webdata/autofill_webdata_backend_impl.h',
+        'autofill/core/browser/webdata/autofill_webdata_service.cc',
+        'autofill/core/browser/webdata/autofill_webdata_service.h',
+        'autofill/core/browser/webdata/autofill_webdata_service_observer.h',
 
+        # This file is generated by the autofill_regexes action.
+        '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc',
+      ],
+
+      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+      'msvs_disabled_warnings': [4267, ],
+    },
+
+    {
+      'target_name': 'autofill_core_test_support',
+      'type': 'static_library',
+      'dependencies': [
+        'autofill_core_common',
+        'autofill_core_browser',
+        '../skia/skia.gyp:skia',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'sources': [
+        'autofill/core/browser/android/test_auxiliary_profile_loader_android.cc',
+        'autofill/core/browser/android/test_auxiliary_profile_loader_android.h',
+        'autofill/core/browser/autofill_test_utils.cc',
+        'autofill/core/browser/autofill_test_utils.h',
+        'autofill/core/browser/data_driven_test.cc',
+        'autofill/core/browser/data_driven_test.h',
+        'autofill/core/browser/test_autofill_driver.cc',
+        'autofill/core/browser/test_autofill_driver.h',
+        'autofill/core/browser/test_autofill_external_delegate.cc',
+        'autofill/core/browser/test_autofill_external_delegate.h',
+        'autofill/core/browser/test_autofill_manager_delegate.cc',
+        'autofill/core/browser/test_autofill_manager_delegate.h',
+        'autofill/core/browser/test_personal_data_manager.cc',
+        'autofill/core/browser/test_personal_data_manager.h',
+      ],
+    },
+  ],
+  'conditions': [
+    ['OS != "ios"', {
+      'targets': [
         {
           'target_name': 'autofill_content_common',
           'type': 'static_library',
@@ -102,164 +265,6 @@
         },
 
         {
-          'target_name': 'autofill_core_browser',
-          'type': 'static_library',
-          'include_dirs': [
-            '..',
-          ],
-          'dependencies': [
-            'autofill_core_common',
-            'autofill_regexes',
-            'encryptor',
-            'user_prefs',
-            'webdata_common',
-            '../base/base.gyp:base',
-            '../base/base.gyp:base_i18n',
-            '../base/base.gyp:base_prefs',
-            '../content/content.gyp:content_browser',
-            '../content/content.gyp:content_common',
-            '../google_apis/google_apis.gyp:google_apis',
-            '../skia/skia.gyp:skia',
-            '../sql/sql.gyp:sql',
-            '../third_party/icu/icu.gyp:icui18n',
-            '../third_party/icu/icu.gyp:icuuc',
-            '../third_party/libjingle/libjingle.gyp:libjingle',
-            '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
-            '../ui/gfx/gfx.gyp:gfx',
-            '../ui/ui.gyp:ui',
-            '../url/url.gyp:url_lib',
-            '../webkit/webkit_resources.gyp:webkit_resources',
-
-            'component_strings.gyp:component_strings',
-          ],
-          'sources': [
-            'autofill/core/browser/address.cc',
-            'autofill/core/browser/address.h',
-            'autofill/core/browser/address_field.cc',
-            'autofill/core/browser/address_field.h',
-            'autofill/core/browser/autocomplete_history_manager.cc',
-            'autofill/core/browser/autocomplete_history_manager.h',
-            'autofill/core/browser/autofill-inl.h',
-            'autofill/core/browser/autofill_country.cc',
-            'autofill/core/browser/autofill_country.h',
-            'autofill/core/browser/autofill_data_model.cc',
-            'autofill/core/browser/autofill_data_model.h',
-            'autofill/core/browser/autofill_download.cc',
-            'autofill/core/browser/autofill_download.h',
-            'autofill/core/browser/autofill_download_url.cc',
-            'autofill/core/browser/autofill_download_url.h',
-            'autofill/core/browser/autofill_driver.h',
-            'autofill/core/browser/autofill_external_delegate.cc',
-            'autofill/core/browser/autofill_external_delegate.h',
-            'autofill/core/browser/autofill_field.cc',
-            'autofill/core/browser/autofill_field.h',
-            'autofill/core/browser/autofill_ie_toolbar_import_win.cc',
-            'autofill/core/browser/autofill_ie_toolbar_import_win.h',
-            'autofill/core/browser/autofill_manager.cc',
-            'autofill/core/browser/autofill_manager.h',
-            'autofill/core/browser/autofill_manager_delegate.h',
-            'autofill/core/browser/autofill_manager_test_delegate.h',
-            'autofill/core/browser/autofill_metrics.cc',
-            'autofill/core/browser/autofill_metrics.h',
-            'autofill/core/browser/autofill_popup_delegate.h',
-            'autofill/core/browser/autofill_profile.cc',
-            'autofill/core/browser/autofill_profile.h',
-            'autofill/core/browser/autofill_regex_constants.cc.utf8',
-            'autofill/core/browser/autofill_regex_constants.h',
-            'autofill/core/browser/autofill_regexes.cc',
-            'autofill/core/browser/autofill_regexes.h',
-            'autofill/core/browser/autofill_scanner.cc',
-            'autofill/core/browser/autofill_scanner.h',
-            'autofill/core/browser/autofill_server_field_info.h',
-            'autofill/core/browser/autofill_type.cc',
-            'autofill/core/browser/autofill_type.h',
-            'autofill/core/browser/autofill_xml_parser.cc',
-            'autofill/core/browser/autofill_xml_parser.h',
-            'autofill/core/browser/contact_info.cc',
-            'autofill/core/browser/contact_info.h',
-            'autofill/core/browser/credit_card.cc',
-            'autofill/core/browser/credit_card.h',
-            'autofill/core/browser/credit_card_field.cc',
-            'autofill/core/browser/credit_card_field.h',
-            'autofill/core/browser/email_field.cc',
-            'autofill/core/browser/email_field.h',
-            'autofill/core/browser/field_types.h',
-            'autofill/core/browser/form_field.cc',
-            'autofill/core/browser/form_field.h',
-            'autofill/core/browser/form_group.cc',
-            'autofill/core/browser/form_group.h',
-            'autofill/core/browser/form_structure.cc',
-            'autofill/core/browser/form_structure.h',
-            'autofill/core/browser/name_field.cc',
-            'autofill/core/browser/name_field.h',
-            'autofill/core/browser/password_autofill_manager.cc',
-            'autofill/core/browser/password_autofill_manager.h',
-            'autofill/core/browser/password_generator.cc',
-            'autofill/core/browser/password_generator.h',
-            'autofill/core/browser/personal_data_manager.cc',
-            'autofill/core/browser/personal_data_manager.h',
-            'autofill/core/browser/personal_data_manager_mac.mm',
-            '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/state_names.cc',
-            'autofill/core/browser/state_names.h',
-            'autofill/core/browser/validation.cc',
-            'autofill/core/browser/validation.h',
-            'autofill/core/browser/webdata/autofill_change.cc',
-            'autofill/core/browser/webdata/autofill_change.h',
-            'autofill/core/browser/webdata/autofill_entry.cc',
-            'autofill/core/browser/webdata/autofill_entry.h',
-            'autofill/core/browser/webdata/autofill_table.cc',
-            'autofill/core/browser/webdata/autofill_table.h',
-            'autofill/core/browser/webdata/autofill_webdata.h',
-            'autofill/core/browser/webdata/autofill_webdata_backend.h',
-            'autofill/core/browser/webdata/autofill_webdata_backend_impl.cc',
-            'autofill/core/browser/webdata/autofill_webdata_backend_impl.h',
-            'autofill/core/browser/webdata/autofill_webdata_service.cc',
-            'autofill/core/browser/webdata/autofill_webdata_service.h',
-            'autofill/core/browser/webdata/autofill_webdata_service_observer.h',
-
-            # This file is generated by the autofill_regexes action.
-            '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc',
-          ],
-
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [4267, ],
-        },
-
-        {
-          'target_name': 'autofill_core_test_support',
-          'type': 'static_library',
-          'dependencies': [
-            'autofill_core_common',
-            'autofill_core_browser',
-            '../skia/skia.gyp:skia',
-            '../testing/gtest.gyp:gtest',
-          ],
-          'sources': [
-            'autofill/core/browser/android/test_auxiliary_profile_loader_android.cc',
-            'autofill/core/browser/android/test_auxiliary_profile_loader_android.h',
-            'autofill/core/browser/autofill_test_utils.cc',
-            'autofill/core/browser/autofill_test_utils.h',
-            'autofill/core/browser/data_driven_test.cc',
-            'autofill/core/browser/data_driven_test.h',
-            'autofill/core/browser/test_autofill_driver.cc',
-            'autofill/core/browser/test_autofill_driver.h',
-            'autofill/core/browser/test_autofill_external_delegate.cc',
-            'autofill/core/browser/test_autofill_external_delegate.h',
-            'autofill/core/browser/test_autofill_manager_delegate.cc',
-            'autofill/core/browser/test_autofill_manager_delegate.h',
-            'autofill/core/browser/test_personal_data_manager.cc',
-            'autofill/core/browser/test_personal_data_manager.h',
-          ],
-        },
-
-        {
           # Protobuf compiler / generate rule for Autofill's risk integration.
           'target_name': 'autofill_content_risk_proto',
           'type': 'static_library',
diff --git a/components/autofill/core/browser/credit_card.cc b/components/autofill/core/browser/credit_card.cc
index 92e82c3..2d62c5e 100644
--- a/components/autofill/core/browser/credit_card.cc
+++ b/components/autofill/core/browser/credit_card.cc
@@ -25,11 +25,16 @@
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "grit/component_strings.h"
-#include "grit/webkit_resources.h"
 #include "third_party/icu/source/common/unicode/uloc.h"
 #include "third_party/icu/source/i18n/unicode/dtfmtsym.h"
 #include "ui/base/l10n/l10n_util.h"
 
+// TODO(blundell): Eliminate the need for this conditional include.
+// crbug.com/328150
+#if !defined(OS_IOS)
+#include "grit/webkit_resources.h"
+#endif
+
 namespace autofill {
 
 namespace {
@@ -164,6 +169,12 @@ base::string16 CreditCard::TypeForDisplay(const std::string& type) {
 
 // static
 int CreditCard::IconResourceId(const std::string& type) {
+  // TODO(blundell): Either move these resources out of webkit_resources or
+  // this function into //components/autofill/content/browser to eliminate the
+  // need for this ifdef-ing. crbug.com/328150
+#if defined(OS_IOS)
+  return 0;
+#else
   if (type == kAmericanExpressCard)
     return IDR_AUTOFILL_CC_AMEX;
   if (type == kDinersCard)
@@ -183,6 +194,7 @@ int CreditCard::IconResourceId(const std::string& type) {
   // include a new card.
   DCHECK_EQ(kGenericCard, type);
   return IDR_AUTOFILL_CC_GENERIC;
+#endif  // defined(OS_IOS)
 }
 
 // static
diff --git a/components/autofill/core/browser/personal_data_manager.cc b/components/autofill/core/browser/personal_data_manager.cc
index 28d92d4..48438a8 100644
--- a/components/autofill/core/browser/personal_data_manager.cc
+++ b/components/autofill/core/browser/personal_data_manager.cc
@@ -866,9 +866,9 @@ void PersonalDataManager::LoadProfiles() {
   pending_profiles_query_ = database_->GetAutofillProfiles(this);
 }
 
-// Win and Linux implementations do nothing. Mac and Android implementations
-// fill in the contents of |auxiliary_profiles_|.
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+// Win, Linux, and iOS implementations do nothing. Mac and Android
+// implementations fill in the contents of |auxiliary_profiles_|.
+#if defined(OS_IOS) || (!defined(OS_MACOSX) && !defined(OS_ANDROID))
 void PersonalDataManager::LoadAuxiliaryProfiles() const {
 }
 #endif
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 2c1eea3..2229538 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -73,6 +73,11 @@
             # 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',
+
             # Dependencies of dom_distiller
             'components.gyp:distilled_page_proto',
             'components.gyp:dom_distiller_core',
@@ -99,10 +104,6 @@
           'conditions': [
             ['OS != "ios"', {
               'dependencies': [
-                # Dependencies of autofill
-                'components.gyp:autofill_core_browser',
-                'components.gyp:autofill_core_common',
-
                 # Dependencies of browser_context_keyed_service
                 'components.gyp:browser_context_keyed_service',
 
@@ -134,6 +135,7 @@
                 # TODO(asvitkine): Bring up variations/ unittests on iOS.
                 # TODO(blundell): Bring up json_schema/ unittests on iOS.
                 ['include', '^auto_login_parser/'],
+                ['include', '^autofill/'],
                 ['include', '^dom_distiller/'],
                 ['include', '^precache/'],
                 ['include', '^translate/'],