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..a4138885e0727c77f4884b5d921061912e5b158c 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -13,11 +13,43 @@
     ['android_webview_build == 0', {
       'targets': [
         {
+          'target_name': 'components_unittests_strings',

[tony, 2013/11/24 04:24:07]

Nit: I would probably name the file something like components_test_pak and the
filename something like components_test.pak like you did with
ui_test_pak/ui_test.pak.

[tfarina, 2013/11/24 17:19:41]

Done.

+          'type': 'none',
+          'dependencies': [
+            'component_strings.gyp:component_strings',
+          ],
+          'variables': {
+            'repack_path': '../tools/grit/grit/format/repack.py',
+          },
+          'actions': [
+            {
+              'action_name': 'repack_components_unittests_strings',
+              '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',

[tfarina, 2013/11/23 23:20:30]

I had to add this line, otherwise ResourceBundle does not find
IDS_UI_FONT_FAMILY_CROS.

[tony, 2013/11/24 04:24:07]

That's fine, but should this target depend on
ui/base/strings/ui_strings.gyp:ui_strings?

[tfarina, 2013/11/24 17:19:41]

I added, thanks for catching this. I think it will be necessary, in order to
generate the app_locale_settings_en-US.pak.

+                ],
+              },
+              'inputs': [
+                '<(repack_path)',
+                '<@(pak_inputs)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/components/strings/component_strings_en-US.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_unittests_strings',
+
             # Dependencies of autofill
             'components.gyp:autofill_core_browser',
             'components.gyp:autofill_core_common',