Revert of Remove more blink modules gypi code.

third_party/WebKit/Source/build/scripts/scripts.gni

Index: third_party/WebKit/Source/build/scripts/scripts.gni
diff --git a/third_party/WebKit/Source/build/scripts/scripts.gni b/third_party/WebKit/Source/build/scripts/scripts.gni
index 33ba38f4462f76d8e70013a05d32788f777a2c66..edb1937a579ccd241fd10b0488a646fe2072bd20 100644
--- a/third_party/WebKit/Source/build/scripts/scripts.gni
+++ b/third_party/WebKit/Source/build/scripts/scripts.gni
@@ -94,8 +94,7 @@
 #   outputs: expected results. Note that the directory of the 0th item in this
 #            list will be taken to be the output path.
 #   other_args: (optional) other arguments to pass to the script.
-#   deps [optional]:
-#     Depenendencies. If unspecified defaults to make_core_generated_deps.
+#   deps [optional]: additional depenendencies
 template("process_in_files") {
   action(target_name) {
     script = invoker.script
@@ -119,12 +118,10 @@
       args += invoker.other_args
     }
 
+    deps = make_core_generated_deps
     if (defined(invoker.deps)) {
-      deps = invoker.deps
-    } else {
-      deps = make_core_generated_deps
-    }
-    forward_variables_from(invoker, [ "visibility" ])
+      deps += invoker.deps
+    }
   }
 }
 
@@ -151,20 +148,16 @@
 # process_in_files.
 #   in_files: files to pass to the script
 #   outputs: expected results
-#   deps [optional]:
-#     Dependencies. See process_in_files for definition.
+#   deps [optional]: additional dependencies
 template("make_names") {
   process_in_files(target_name) {
     script = "//third_party/WebKit/Source/build/scripts/make_names.py"
+    in_files = invoker.in_files
     other_inputs = make_names_files
-    forward_variables_from(invoker,
-                           [
-                             "deps",
-                             "in_files",
-                             "outputs",
-                             "public_deps",
-                             "visibility",
-                           ])
+    outputs = invoker.outputs
+    if (defined(invoker.deps)) {
+      deps = invoker.deps
+    }
   }
 }
 
@@ -185,19 +178,16 @@
 # process_in_files.
 #   in_files: list of ".in" files to process.
 #   outputs: list of output files
-#   deps [optional]
-#     Dependencies. See process_in_files for definition.
+#   deps [optional]: additional depenendencies
 template("make_event_factory") {
   process_in_files(target_name) {
     script = "//third_party/WebKit/Source/build/scripts/make_event_factory.py"
+    in_files = invoker.in_files
     other_inputs = make_event_factory_files
-    forward_variables_from(invoker,
-                           [
-                             "deps",
-                             "in_files",
-                             "outputs",
-                             "visibility",
-                           ])
+    outputs = invoker.outputs
+    if (defined(invoker.deps)) {
+      deps = invoker.deps
+    }
   }
 }