Enable generation of da.pak, he,pak, and zh-TW.pak. Re-enable

locale UI tests on windows and linux.

Not sure if this will work on mac with resource bundles, so leaving
this disabled for now.

BUG=9758

Review URL: http://codereview.chromium.org/113158


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

3 files changed, 104 insertions, 4 deletions

diff --git a/chrome/browser/locale_tests_uitest.cc b/chrome/browser/locale_tests_uitest.cc
index 8338d40d..36e4466 100644
--- a/chrome/browser/locale_tests_uitest.cc
+++ b/chrome/browser/locale_tests_uitest.cc
@@ -25,7 +25,7 @@ class LocaleTestsZhTw : public UITest {
   }
 };
 
-#if 0
+#if defined(OS_WIN) || defined(OS_LINUX)
 // These 3 tests started failing between revisions 13115 and 13120.
 // See bug 9758.
 TEST_F(LocaleTestsDa, TestStart) {
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 95cdc1a..c0cbfa22 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -88,7 +88,10 @@
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/<(RULE_INPUT_ROOT).h',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT)_da.pak',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT)_en-US.pak',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT)_he.pak',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT)_zh-TW.pak',
           ],
           'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/chrome'],
           'message': 'Generating resources from <(RULE_INPUT_PATH)',
@@ -1877,7 +1880,11 @@
             },
             {
               'destination': '<(PRODUCT_DIR)/locales',
-              'files': ['<(INTERMEDIATE_DIR)/repack/en-US.pak'],
+              'files': ['<(INTERMEDIATE_DIR)/repack/da.pak',
+                        '<(INTERMEDIATE_DIR)/repack/en-US.pak',
+                        '<(INTERMEDIATE_DIR)/repack/he.pak',
+                        '<(INTERMEDIATE_DIR)/repack/zh-TW.pak',
+                        ],
             },
             {
               'destination': '<(PRODUCT_DIR)/themes',
@@ -1994,8 +2001,37 @@
             },
             {
               # TODO(mark): Make this work with more languages than the
-              # hardcoded en-US.
-              'action_name': 'repack_locale',
+              # hardcoded da, en-US, he, zh-TW.
+              'action_name': 'repack_locale_da',
+              'variables': {
+                'pak_inputs': [
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_da.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/chromium_strings_da.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/locale_settings_da.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_da.pak',
+                ],
+              },
+              'inputs': [
+                '<(repack_path)',
+                '<@(pak_inputs)',
+              ],
+              'conditions': [
+                ['OS=="mac"', {
+                  'outputs': [
+                    '<(INTERMEDIATE_DIR)/repack/da.lproj/locale.pak',
+                  ],
+                }, {  # else: OS!="mac"
+                  'outputs': [
+                    '<(INTERMEDIATE_DIR)/repack/da.pak',
+                  ],
+                }],
+              ],
+              'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+            },
+            {
+              # TODO(mark): Make this work with more languages than the
+              # hardcoded da, en-US, he, zh-TW.
+              'action_name': 'repack_locale_en_us',
               'variables': {
                 'pak_inputs': [
                   '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.pak',
@@ -2022,6 +2058,64 @@
               'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
               'process_outputs_as_mac_bundle_resources': 1,
             },
+            {
+              # TODO(mark): Make this work with more languages than the
+              # hardcoded da, en-US, he, zh-TW.
+              'action_name': 'repack_locale_he',
+              'variables': {
+                'pak_inputs': [
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_he.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/chromium_strings_he.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/locale_settings_he.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_he.pak',
+                ],
+              },
+              'inputs': [
+                '<(repack_path)',
+                '<@(pak_inputs)',
+              ],
+              'conditions': [
+                ['OS=="mac"', {
+                  'outputs': [
+                    '<(INTERMEDIATE_DIR)/repack/he.lproj/locale.pak',
+                  ],
+                }, {  # else: OS!="mac"
+                  'outputs': [
+                    '<(INTERMEDIATE_DIR)/repack/he.pak',
+                  ],
+                }],
+              ],
+              'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+            },
+            {
+              # TODO(mark): Make this work with more languages than the
+              # hardcoded da, en-US, he, zh-TW.
+              'action_name': 'repack_locale_zh_tw',
+              'variables': {
+                'pak_inputs': [
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_zh-TW.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/chromium_strings_zh-TW.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/locale_settings_zh-TW.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_zh-TW.pak',
+                ],
+              },
+              'inputs': [
+                '<(repack_path)',
+                '<@(pak_inputs)',
+              ],
+              'conditions': [
+                ['OS=="mac"', {
+                  'outputs': [
+                    '<(INTERMEDIATE_DIR)/repack/zh.lproj/locale.pak',
+                  ],
+                }, {  # else: OS!="mac"
+                  'outputs': [
+                    '<(INTERMEDIATE_DIR)/repack/zh-TW.pak',
+                  ],
+                }],
+              ],
+              'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+            },
           ],
           'sources!': [
             'app/chrome_exe_main.cc',
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 064547a..f91b4fd 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -4298,8 +4298,14 @@
           ],
           'outputs': [
             '<(grit_out_dir)/grit/webkit_strings.h',
+            '<(grit_out_dir)/webkit_strings_da.pak',
+            '<(grit_out_dir)/webkit_strings_da.rc',
             '<(grit_out_dir)/webkit_strings_en-US.pak',
             '<(grit_out_dir)/webkit_strings_en-US.rc',
+            '<(grit_out_dir)/webkit_strings_he.pak',
+            '<(grit_out_dir)/webkit_strings_he.rc',
+            '<(grit_out_dir)/webkit_strings_zh-TW.pak',
+            '<(grit_out_dir)/webkit_strings_zh-TW.rc',
           ],
           'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'],
           'message': 'Generating resources from <(input_path)',