Forward "testonly" variables in repack and repack_and_bundle template.

tools/grit/repack.gni

Index: tools/grit/repack.gni
diff --git a/tools/grit/repack.gni b/tools/grit/repack.gni
index 11bed43a52cbf7c04388c955c898afb71c323cbb..42087f9afacdbc6af234ce3f999d52d3cc2777e4 100644
--- a/tools/grit/repack.gni
+++ b/tools/grit/repack.gni
@@ -22,13 +22,15 @@ declare_args() {
 #       Normal meaning.
 template("repack") {
   action(target_name) {
+    forward_variables_from(invoker,
+                           [
+                             "deps",
+                             "testonly",
+                             "visibility",
+                           ])
     assert(defined(invoker.sources), "Need sources for $target_name")
     assert(defined(invoker.output), "Need output for $target_name")
 
-    if (defined(invoker.visibility)) {
-      visibility = invoker.visibility
-    }
-
     script = "//tools/grit/grit/format/repack.py"
 
     inputs = invoker.sources
@@ -45,10 +47,6 @@ template("repack") {
     }
     args += [ rebase_path(invoker.output, root_build_dir) ]
     args += rebase_path(invoker.sources, root_build_dir)
-
-    if (defined(invoker.deps)) {
-      deps = invoker.deps
-    }
   }
 }
 
@@ -82,11 +80,16 @@ template("repack_and_bundle") {
                              "deps",
                              "output",
                              "sources",
+                             "testonly",
                            ])
   }
 
   bundle_data(_bundle_target_name) {
-    forward_variables_from(invoker, [ "visibility" ])
+    forward_variables_from(invoker,
+                           [
+                             "testonly",
+                             "visibility",
+                           ])
 
     public_deps = [
       ":$_repack_target_name",