Remove more blink modules gypi code.

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 aae4f05372587d32e255e9a05ccc800182326a12..2d7960f8bfe871aba46e2d0af6cc73e64a854909 100644
--- a/third_party/WebKit/Source/modules/BUILD.gn
+++ b/third_party/WebKit/Source/modules/BUILD.gn
@@ -33,6 +33,15 @@ config("modules_implementation") {
   }
 }
 
+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"
 
@@ -43,7 +52,19 @@ target(modules_target_type, "modules") {
   visibility = []  # Allow re-assignment of list.
   visibility = [ "//third_party/WebKit/*" ]
 
-  sources = rebase_path(modules_files, ".", "//")
+  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 += bindings_modules_v8_files
   sources += rebase_path(bindings_modules_generated_aggregate_files, ".", "//")
   sources += rebase_path(bindings_modules_generated_union_type_files, ".", "//")
@@ -66,10 +87,12 @@ target(modules_target_type, "modules") {
 
   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",
@@ -137,25 +160,6 @@ source_set("modules_testing") {
   ]
 }
 
-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",