Revert of Remove more blink modules gypi code.

third_party/WebKit/Source/modules/modules.gni

 # 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.
 
-# DON'T INCLUDE modules_idl_files.gni FROM HERE.
-#
-# This file is shared with all modules' BUILD files which shouldn't need access
-# to the huge and slow lists of sources. If sharing is necessary, make a
-# separate .gni.
 import("//third_party/WebKit/Source/config.gni")
 
 _gypi = exec_script(
         "//build/gypi_to_gn.py",
         [
           rebase_path("modules.gypi"),
           "--replace=<(SHARED_INTERMEDIATE_DIR)=$root_gen_dir",
           "--replace=<(blink_modules_output_dir)=$root_gen_dir/blink/modules",
         ],
         "scope",
         [ "modules.gypi" ])
-modules_files = get_path_info(_gypi.modules_files, "abspath")
+
+# interfaces that inherit from Event
+generated_modules_files =
+    get_path_info(_gypi.generated_modules_files, "abspath")
+
+generated_modules_dictionary_files =
+    get_path_info(_gypi.generated_modules_dictionary_files, "abspath")
+
+# Remove GYP variables from the list (need to do this before rebasing).
+_tmp_modules_files = _gypi.modules_files
+_tmp_modules_files -= [
+  "<@(extra_blink_module_files)",
+  "<@(generated_modules_dictionary_files)",
+  "<@(generated_modules_files)",
+]
+modules_files = get_path_info(_tmp_modules_files, "abspath")
+
+# Account for GYP var expansion.
+modules_files += generated_modules_files + generated_modules_dictionary_files
 
 # Defines a part of blink modules. This is either a source set or a static
 # library with defaults for commonly-used values.
 #
 #   deps
 #      Default deps are automatically appended to any specified on the caller.
 #
 #   visibility
 #      Normal meaning if defined. If undefined, defaults to everything in core.
 template("blink_modules_sources") {
@@ skipping 32 matching lines @@
     "//third_party/WebKit/Source:config",
     "//third_party/WebKit/Source/modules:modules_implementation",
     "//third_party/WebKit/Source:non_test_config",
     "//third_party/WebKit/Source:inside_blink",
   ]
   if (remove_webcore_debug_symbols) {
     configs -= [ "//build/config/compiler:default_symbols" ]
     configs += [ "//build/config/compiler:no_symbols" ]
   }
 }