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

ios/chrome/extension_repack.gni

 # Copyright 2016 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.
 
 import("//tools/grit/repack.gni")
 
 # Pack all resources for an application extension for a given locale.
 #
 # Arguments:
 #
@@ skipping 13 matching lines @@
 #       data into the final bundle.
 #
 #   visibility [optional]
 #       usual meaning.
 #
 template("_extension_repack_one_locale") {
   assert(defined(invoker.extension), "Need extension for $target_name")
   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 = [
       "//ios/chrome/${invoker.extension}/strings",
     ]
 
     sources = [
       "$root_gen_dir/ios/${invoker.extension}/" +
           "ios_${invoker.extension}_strings_${invoker.input_locale}.pak",
     ]
 
     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"
     }
   }
 }
 
 # Pack all resources for an application extension for all locales.
 #
 # Arguments:
 #
@@ skipping 52 matching lines @@
 
     _locale_targets += [ ":$_locale_target" ]
     _current_locale = _current_locale + 1
   }
 
   group(_target_name) {
     forward_variables_from(invoker, [ "visibility" ])
     public_deps = _locale_targets
   }
 }