Delete chrome_framework_locales in favour of copy_data_to_bundle=true

tools/grit/repack.gni

 # Copyright 2014 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/grit_rule.gni")
 
 # This file defines a template to invoke grit repack in a consistent manner.
 #
 # Parameters:
 #   sources  [required]
@@ skipping 101 matching lines @@
 #   output_dir [optional]
 #       Directory in which to put all pak files.
 #
 #   deps  [optional]
 #   visibility  [optional]
 #   testonly  [optional]
 #   copy_data_to_bundle [optional]
 #   repack_whitelist [optional]
 #       Normal meaning.
 template("repack_locales") {
+  if (defined(invoker.output_dir)) {
+    _output_dir = invoker.output_dir
+  } else if (is_ios) {
+    _output_dir = "$target_gen_dir"
+  } else {
+    _output_dir = "$target_gen_dir/$target_name"
+  }
+
   # GN can't handle invoker.output_locales[foo] (http://crbug.com/614747).
   _output_locales = invoker.output_locales
-  if (defined(invoker.output_dir)) {
-    _output_dir = invoker.output_dir
-  } else {
-    if (is_ios) {
-      _output_dir = "$target_gen_dir"
-    } else {
-      _output_dir = "$target_gen_dir/$target_name"
-    }
-  }
 
   # Collects all targets the loop generates.
   _locale_targets = []
 
   # This loop iterates over the input locales and also keeps a counter so it
   # can simultaneously iterate over the output locales (using GN's very
   # limited looping capabilities).
   _current_index = 0
   foreach(_input_locale, invoker.input_locales) {
     _output_locale = _output_locales[_current_index]
 
     # Compute the name of the target for the current file. Save it for the deps.
     _current_name = "${target_name}_${_input_locale}"
     _locale_targets += [ ":$_current_name" ]
 
     repack(_current_name) {
       forward_variables_from(invoker,
                              [
                                "copy_data_to_bundle",
                                "bundle_output",
                                "deps",
                                "repack_whitelist",
                                "testonly",
                              ])
       visibility = [ ":${invoker.target_name}" ]
       if (is_ios) {
         output = "$_output_dir/${_output_locale}.lproj/locale.pak"
-        if (defined(copy_data_to_bundle) && copy_data_to_bundle) {
-          bundle_output =
-              "{{bundle_resources_dir}}/${_output_locale}.lproj/locale.pak"
-        }
       } else {
         output = "$_output_dir/${_output_locale}.pak"
       }
+      if (defined(copy_data_to_bundle) && copy_data_to_bundle) {
+        bundle_output =
+            "{{bundle_resources_dir}}/${_output_locale}.lproj/locale.pak"
+      }
       set_sources_assignment_filter([])
       sources = []
       foreach(_pattern, invoker.source_patterns) {
         sources += [ "${_pattern}${_input_locale}.pak" ]
       }
     }
 
     _current_index = _current_index + 1
   }
 
   # The group that external targets depend on which collects all deps.
   group(target_name) {
     forward_variables_from(invoker,
                            [
                              "visibility",
                              "testonly",
                            ])
     public_deps = _locale_targets
   }
 }