Revert of Remove more blink modules gypi code.

Revert of Remove more blink modules gypi code. (patchset #2 id:20001 of https://codereview.chromium.org/2328773002/ )

Reason for revert:
https://bugs.chromium.org/p/chromium/issues/detail?id=645621
BUG=645621
Original issue's description:
> Remove more blink modules gypi code.
> 
> Improves the templates for make_names and process_in_files so they can be used
> in a few more situations (not automatically inserting deps), clean up callers
> that were manually calling these.
> 
> Add a new target bindings/modules:generated which compiles the sources
> generated by the scripts in that file. This eliminates the hardcoding of these
> source lists.
> 
> With this, the only remaining blink work should be to move the rest of the
> source files into the modules sub-directories.
> 
> Committed: https://crrev.com/0a91363934d878f3cd10aed2b4caf6fe239ec571
> Cr-Commit-Position: refs/heads/master@{#417667}

TBR=haraken@chromium.org,brettw@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

[dmurph, 2016-09-10 01:35:10]

The CQ bit was checked by dmurph@chromium.org

[dmurph, 2016-09-10 01:35:10]

Created Revert of Remove more blink modules gypi code.

[commit-bot: I haz the power, 2016-09-10 01:35:36]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-10 01:36:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-10 01:36:45]

Failed to apply patch for third_party/WebKit/Source/modules/BUILD.gn:
While running git apply --index -3 -p1;
  error: patch failed: third_party/WebKit/Source/modules/BUILD.gn:52
  Falling back to three-way merge...
  Applied patch to 'third_party/WebKit/Source/modules/BUILD.gn' with conflicts.
  U third_party/WebKit/Source/modules/BUILD.gn

Patch:       third_party/WebKit/Source/modules/BUILD.gn
Index: third_party/WebKit/Source/modules/BUILD.gn
diff --git a/third_party/WebKit/Source/modules/BUILD.gn
b/third_party/WebKit/Source/modules/BUILD.gn
index
2d7960f8bfe871aba46e2d0af6cc73e64a854909..aae4f05372587d32e255e9a05ccc800182326a12
100644
--- a/third_party/WebKit/Source/modules/BUILD.gn
+++ b/third_party/WebKit/Source/modules/BUILD.gn
@@ -33,15 +33,6 @@
   }
 }
 
-make_names("module_names") {
-  in_files = [ "indexeddb/IndexedDBNames.in" ]
-  outputs = [
-    "$blink_modules_output_dir/IndexedDBNames.cpp",
-    "$blink_modules_output_dir/IndexedDBNames.h",
-  ]
-  deps = []  # Don't use default deps (otherwise it will be circular).
-}
-
 target(modules_target_type, "modules") {
   output_name = "blink_modules"
 
@@ -52,19 +43,7 @@
   visibility = []  # Allow re-assignment of list.
   visibility = [ "//third_party/WebKit/*" ]
 
-  sources = [
-    "ModulesInitializer.cpp",
-    "ModulesInitializer.h",
-  ]
-
-  # These are the files that still need to be moved to separate BUILD files.
-  sources += rebase_path(modules_files, ".", "//")
-
-  sources += generated_modules_dictionary_files
-
-  # Compile sources generated by module_names script.
-  sources += get_target_outputs(":module_names")
-
+  sources = rebase_path(modules_files, ".", "//")
   sources += bindings_modules_v8_files
   sources += rebase_path(bindings_modules_generated_aggregate_files, ".", "//")
   sources += rebase_path(bindings_modules_generated_union_type_files, ".",
"//")
@@ -87,12 +66,10 @@
 
   deps = [
     ":make_modules_generated",
-    ":module_names",
     "//device/battery:mojo_bindings_blink",
     "//device/geolocation/public/interfaces:interfaces_blink",
     "//device/nfc:mojo_bindings_blink",
     "//media/mojo/interfaces:image_capture_blink",
-    "//third_party/WebKit/Source/bindings/modules:generated",
     "//third_party/WebKit/Source/core",
     "//third_party/WebKit/Source/modules/sensor",
     "//third_party/WebKit/Source/modules/serviceworkers",
@@ -160,6 +137,25 @@
   ]
 }
 
+action("module_names") {
+  script = "../build/scripts/make_names.py"
+
+  module_names_in = "indexeddb/IndexedDBNames.in"
+  inputs = make_names_files + [ module_names_in ]
+
+  outputs = [
+    "$blink_modules_output_dir/IndexedDBNames.cpp",
+    "$blink_modules_output_dir/IndexedDBNames.h",
+  ]
+
+  args = [
+    rebase_path(module_names_in, root_build_dir),
+    "--output_dir",
+    rebase_path(blink_modules_output_dir, root_build_dir),
+  ]
+}
+
+# GYP version:
WebKit/Source/modules/modules_generated.gyp:make_modules_generated
 group("make_modules_generated") {
   public_deps = [
     ":module_names",

[brettw, 2016-09-10 02:31:25]

I'll just fix the error.

[brettw, 2016-09-10 02:39:21]

Should be addressed in:
https://codereview.chromium.org/2327353002/