Delete chrome_framework_locales in favour of copy_data_to_bundle=true

tools/grit/repack.gni

Index: tools/grit/repack.gni
diff --git a/tools/grit/repack.gni b/tools/grit/repack.gni
index aa42028a1106d2ca60fdcc9a20115052cbba5701..8abc397eda23d4c5b96681e0dcdd088d12465077 100644
--- a/tools/grit/repack.gni
+++ b/tools/grit/repack.gni
@@ -119,18 +119,17 @@ template("repack") {
 #   repack_whitelist [optional]
 #       Normal meaning.
 template("repack_locales") {
-  # 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 {
-    if (is_ios) {
-      _output_dir = "$target_gen_dir"
-    } else {
-      _output_dir = "$target_gen_dir/$target_name"
-    }
+    _output_dir = "$target_gen_dir/$target_name"
   }
 
+  # GN can't handle invoker.output_locales[foo] (http://crbug.com/614747).
+  _output_locales = invoker.output_locales
+
   # Collects all targets the loop generates.
   _locale_targets = []
 
@@ -157,13 +156,13 @@ template("repack_locales") {
       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) {