🍵 Refactor the various locale_paks() templates to be more shared

ios/chrome/extension_repack.gni

Index: ios/chrome/extension_repack.gni
diff --git a/ios/chrome/extension_repack.gni b/ios/chrome/extension_repack.gni
index f029d1aaf353950d1531448a0fdf734a19f08825..b0b13b08166aa02948029e32ed89841e9b51398c 100644
--- a/ios/chrome/extension_repack.gni
+++ b/ios/chrome/extension_repack.gni
@@ -31,13 +31,7 @@ template("_extension_repack_one_locale") {
   assert(defined(invoker.input_locale), "Need input_locale for $target_name")
   assert(defined(invoker.output_locale), "Need output_locale for $target_name")
 
-  if (invoker.copy_data_to_bundle) {
-    _target_type = "repack_and_bundle"
-  } else {
-    _target_type = "repack"
-  }
-
-  target(_target_type, target_name) {
+  repack(target_name) {
     forward_variables_from(invoker, [ "visibility" ])
 
     deps = [
@@ -51,6 +45,7 @@ template("_extension_repack_one_locale") {
 
     output = "$target_gen_dir/${invoker.output_locale}.lproj/locale.pak"
     if (invoker.copy_data_to_bundle) {
+      define_bundle_data = true

[sdefresne, 2016/09/13 07:59:19]

Should be:

define_bundle_data = invoker.copy_data_to_bundle

[agrieve, 2016/09/13 14:06:58]

Refactored this whole file to use the same locale_paks() template (somehow
missed this the first time around).

       bundle_output = "{{bundle_resources_dir}}/" +
                       "${invoker.output_locale}.lproj/locale.pak"
     }