Simplify test locales in Mac's ui_unittests Framework (take 2)

ui/resources/BUILD.gn

 # 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")
 import("//tools/grit/repack.gni")
 
 # GYP version: ui/resources/ui_resources.gyp:ui_resources
 group("resources") {
   deps = [
@@ skipping 34 matching lines @@
 }
 
 if (!is_mac) {
   copy("copy_ui_resources_100_percent") {
     sources = [ "$root_gen_dir/ui/resources/ui_resources_100_percent.pak" ]
     outputs = [ "$root_out_dir/ui_resources_100_percent.pak" ]
     deps = [ "//ui/resources" ]
   }
 }
 
-# On iOS the output needs to additionally be copied to another location, so
-# we have this intermediate step.
+# On iOS and Mac the string resources need to go into a locale subfolder, which
+# introduces an extra dependency.
 #
 # GYP version: ui/resources/ui_resources.gyp:ui_test_pak
 #              (copy_ui_test_pak action)
-if (is_ios) {
-  copy("ui_test_pak") {
-    sources = [ "$root_out_dir/ui_test.pak" ]
-    outputs = [ "$root_out_dir/ui/en.lproj/locale.pak" ]
-    deps = [ ":repack_ui_test_pak" ]
+if (is_ios || is_mac) {
+  group("ui_test_pak") {
+    deps = [ ":repack_ui_test_pak", ":repack_ui_test_mac_locale_pack" ]
   }
 } else {
   group("ui_test_pak") {
     deps = [ ":repack_ui_test_pak" ]
   }
 }
 
 # GYP version: ui/resources/ui_resources.gyp:ui_test_pak
 repack("repack_ui_test_pak") {
   # Depend on ui_test_pak instead of this one.
   visibility = [ ":ui_test_pak" ]
 
-  sources = [ 
+  sources = [
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
     "$root_gen_dir/ui/resources/webui_resources.pak",
     "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
     "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
   ]
 
   output = "$root_out_dir/ui_test.pak"
 
   deps = [
     "//ui/resources",
     "//ui/strings",
   ]
 
   if (!is_mac) {
     deps += [ ":copy_ui_resources_100_percent" ]
   }
 }
+
+# Repack just the strings for the framework locales on Mac and iOS. This
+# emulates repack_locales.py, but just for en-US. Note ui_test.pak is not simply
+# copied, because it causes leaks from allocations within system libraries when
+# trying to load non-string resources. http://crbug.com/413034.
+repack("repack_ui_test_mac_locale_pack") {
+  visibility = [ ":ui_test_pak" ]
+
+  sources = [
+    "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
+    "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
+  ]
+
+  output = "$root_out_dir/ui/en.lproj/locale.pak"
+
+  deps = [
+    "//ui/strings",
+  ]
+}