Move more webdata unittests into components_unittests target.

components/components_tests.gyp

 # Copyright (c) 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_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',
             'browser_context_keyed_service/browser_context_dependency_manager_unittest.cc',
             'browser_context_keyed_service/dependency_graph_unittest.cc',
             'dom_distiller/core/article_entry_unittest.cc',
             'dom_distiller/core/distiller_unittest.cc',
             'dom_distiller/core/distiller_url_fetcher_unittest.cc',
             'dom_distiller/core/dom_distiller_database_unittest.cc',
             'dom_distiller/core/dom_distiller_model_unittest.cc',
@@ skipping 25 matching lines @@
           ],
           'include_dirs': [
             '..',
           ],
           'dependencies': [
             '../base/base.gyp:test_support_base',
             '../sync/sync.gyp:sync',
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
 
+            'components_test_pak',
+
             # Dependencies of autofill
             'components.gyp:autofill_core_browser',
             'components.gyp:autofill_core_common',
 
             # Dependencies of auto_login_parser
             'components.gyp:auto_login_parser',
 
             # Dependencies of browser_context_keyed_service
             'components.gyp:browser_context_keyed_service',
 
@@ skipping 49 matching lines @@
                 # TODO(asvitkine): Bring up varations/ unittests on iOS.
                 ['include', '^dom_distiller'],
                 ['include', '^translate'],
               ],
               'dependencies!': [
                 'autofill_core_common',
                 'navigation_interception',
                 'visitedlink_renderer',
               ],
             }],
+            ['OS == "mac"', {
+              'link_settings': {
+                'libraries': [
+                  '$(SDKROOT)/System/Library/Frameworks/AddressBook.framework',
+                ],
+              },
+            }],
             ['disable_nacl==0', {
               'sources': [
                 'nacl/browser/nacl_validation_cache_unittest.cc',
                 'nacl/browser/pnacl_translation_cache_unittest.cc',
               ],
               'dependencies': [
                 'nacl.gyp:nacl_browser',
                 'nacl_common.gyp:nacl_common',
               ],
             }],
@@ skipping 152 matching lines @@
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }