Move more webdata unittests into components_unittests target.

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 2e00f4a99aa36b1792f55deec187181904513c50..56d9a62a9b9096c9c5d82d143f1764ecfe77778c 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -13,11 +13,43 @@
     ['android_webview_build == 0', {
       'targets': [
         {
+          'target_name': 'components_test_pak',
+          'type': 'none',
+          'dependencies': [
+            '../ui/base/strings/ui_strings.gyp:ui_strings',
+            'component_strings.gyp:component_strings',
+          ],
+          'variables': {
+            'repack_path': '../tools/grit/grit/format/repack.py',
+          },
+          'actions': [
+            {
+              'action_name': 'repack_components_test_pak',
+              'variables': {
+                'pak_inputs': [
+                  '<(SHARED_INTERMEDIATE_DIR)/components/strings/component_strings_en-US.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
+                ],
+              },
+              'inputs': [
+                '<(repack_path)',
+                '<@(pak_inputs)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/components/paks/components_test.pak',
+              ],
+              'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+            },
+          ],
+        },
+        {
           'target_name': 'components_unittests',
           'type': '<(gtest_target_type)',
           'sources': [
             'auto_login_parser/auto_login_parser_unittest.cc',
             'autofill/core/browser/webdata/autofill_entry_unittest.cc',
+            'autofill/core/browser/webdata/autofill_table_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',
@@ -63,6 +95,8 @@
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
 
+            'components_test_pak',
+
             # Dependencies of autofill
             'components.gyp:autofill_core_browser',
             'components.gyp:autofill_core_common',
@@ -132,6 +166,13 @@
                 'visitedlink_renderer',
               ],
             }],
+            ['OS == "mac"', {
+              'link_settings': {
+                'libraries': [
+                  '$(SDKROOT)/System/Library/Frameworks/AddressBook.framework',
+                ],
+              },
+            }],
             ['disable_nacl==0', {
               'sources': [
                 'nacl/browser/nacl_validation_cache_unittest.cc',