Splits ash_test_resources_100_percent into two pak files

ash/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")
 import("//ui/base/ui_features.gni")
 
 assert(enable_hidpi)
 
 grit("resources") {
   source = "ash_resources.grd"
   outputs = [
     "grit/ash_resources.h",
     "ash_resources_100_percent.pak",
     "ash_resources_200_percent.pak",
   ]
 }
 
 # Repacks resources needed for ash_unittests, etc. at a given scale.
 # TODO(msw): Use ui_test.pak instead of its pieces? (no 200% support?)
 template("ash_test_resources") {
   percent = invoker.percent
 
   repack("ash_test_resources_${target_name}") {
-    output = "$root_build_dir/ash_test_resources_${percent}_percent.pak"
+    output = "$root_build_dir/${target_name}.pak"
 
     sources = [
       "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak",
       "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak",
     ]
 
     if (percent == "100") {
-      sources += [
-        "$root_gen_dir/content/content_resources.pak",
-        "$root_gen_dir/ui/resources/webui_resources.pak",
-      ]
+      sources += [ "$root_gen_dir/ui/resources/webui_resources.pak" ]
+    }
+
+    if (defined(invoker.sources)) {
+      sources += invoker.sources
     }
 
     deps = [
       "//ash/resources",
-      "//content:resources",
       "//ui/resources",
     ]
 
+    if (defined(invoker.deps)) {
+      deps += invoker.deps
+    }
+
     if (toolkit_views) {
       deps += [
         "//ui/app_list/resources",
         "//ui/views/resources",
       ]
       sources += [
         "$root_gen_dir/ui/app_list/resources/app_list_resources_${percent}_percent.pak",
         "$root_gen_dir/ui/views/resources/views_resources_${percent}_percent.pak",
       ]
 
@@ skipping 12 matching lines @@
   }
 }
 
 ash_test_resources("100_percent") {
   percent = "100"
 }
 
 ash_test_resources("200_percent") {
   percent = "200"
 }
+
+# There is no content_200_percent as content resources are only available at

[msw, 2016/09/06 22:57:38]

We could generate ash_test_resources[with_]_content_200_percent.pak that simply
matches the non-content version... I'm not sure if that duplication is worth
fixing some minor odd deps/filepath inconsistencies elsewhere.

[sky, 2016/09/06 23:25:00]

I originally did that (which is why I have AddDataPacks), but then the files are
6MBs and it seemed silly to generate the same exact file twice.

+# 100%.
+ash_test_resources("content_100_percent") {

[msw, 2016/09/06 22:57:38]

nit: with_content_100_percent?

[sky, 2016/09/06 23:25:00]

Done.

+  percent = "100"
+  sources = [
+    "$root_gen_dir/content/content_resources.pak",
+  ]
+  deps = [
+    "//content:resources",
+  ]
+}