DevTools: Avoid build errors when dynamic module and application names clash

Source/devtools/BUILD.gn

Index: Source/devtools/BUILD.gn
diff --git a/Source/devtools/BUILD.gn b/Source/devtools/BUILD.gn
index ecfdca700ce5c543cf8daac7638c65010dae0e67..38c341b30af354a3296598c1a1ad16677fb88a02 100644
--- a/Source/devtools/BUILD.gn
+++ b/Source/devtools/BUILD.gn
@@ -11,20 +11,22 @@ gypi_values = exec_script(
 # Some of the files in the .gypi use GYP variable expansions, go through and
 # fix them.
 devtools_core_base_files = gypi_values.devtools_core_base_files - [
-  "<@(devtools_main_js_files)",
   "<@(devtools_standalone_files)",
-] + gypi_values.devtools_main_js_files + gypi_values.devtools_standalone_files
+] + gypi_values.devtools_standalone_files
 
 devtools_core_files =
   devtools_core_base_files +
+  gypi_values.devtools_bindings_js_files +
   gypi_values.devtools_common_js_files +
-  gypi_values.devtools_sdk_js_files +
-  gypi_values.devtools_ui_js_files +
   gypi_values.devtools_components_js_files +
   gypi_values.devtools_host_js_files +
+  gypi_values.devtools_main_js_files +
+  gypi_values.devtools_sdk_js_files +
   gypi_values.devtools_screencast_js_files +
   gypi_values.devtools_toolbox_js_files +
-  gypi_values.devtools_toolbox_bootstrap_js_files
+  gypi_values.devtools_toolbox_bootstrap_js_files +
+  gypi_values.devtools_ui_js_files +
+  gypi_values.devtools_workspace_js_files
 
 devtools_extensions_js_files = gypi_values.devtools_extensions_js_files -
   [ "<@(devtools_extension_api_files)" ] +
@@ -72,24 +74,24 @@ action("generate_devtools_grd") {
     "$root_out_dir/resources/inspector/toolbox.css",
     "$root_out_dir/resources/inspector/toolbox.html",
     "$root_out_dir/resources/inspector/toolbox.js",
-    "$root_out_dir/resources/inspector/audits.js",
-    "$root_out_dir/resources/inspector/console.js",
-    "$root_out_dir/resources/inspector/devices.js",
-    "$root_out_dir/resources/inspector/documentation.js",
-    "$root_out_dir/resources/inspector/elements.js",
-    "$root_out_dir/resources/inspector/extensions.js",
-    "$root_out_dir/resources/inspector/heap_snapshot_worker.js",
-    "$root_out_dir/resources/inspector/layers.js",
-    "$root_out_dir/resources/inspector/network.js",
-    "$root_out_dir/resources/inspector/profiler.js",
-    "$root_out_dir/resources/inspector/promises.js",
-    "$root_out_dir/resources/inspector/resources.js",
-    "$root_out_dir/resources/inspector/script_formatter_worker.js",
-    "$root_out_dir/resources/inspector/settings.js",
-    "$root_out_dir/resources/inspector/source_frame.js",
-    "$root_out_dir/resources/inspector/sources.js",
-    "$root_out_dir/resources/inspector/temp_storage_shared_worker.js",
-    "$root_out_dir/resources/inspector/timeline.js",
+    "$root_out_dir/resources/inspector/audits_module.js",
+    "$root_out_dir/resources/inspector/console_module.js",
+    "$root_out_dir/resources/inspector/devices_module.js",
+    "$root_out_dir/resources/inspector/documentation_module.js",
+    "$root_out_dir/resources/inspector/elements_module.js",
+    "$root_out_dir/resources/inspector/extensions_module.js",
+    "$root_out_dir/resources/inspector/heap_snapshot_worker_module.js",
+    "$root_out_dir/resources/inspector/layers_module.js",
+    "$root_out_dir/resources/inspector/network_module.js",
+    "$root_out_dir/resources/inspector/profiler_module.js",
+    "$root_out_dir/resources/inspector/promises_module.js",
+    "$root_out_dir/resources/inspector/resources_module.js",
+    "$root_out_dir/resources/inspector/script_formatter_worker_module.js",
+    "$root_out_dir/resources/inspector/settings_module.js",
+    "$root_out_dir/resources/inspector/source_frame_module.js",
+    "$root_out_dir/resources/inspector/sources_module.js",
+    "$root_out_dir/resources/inspector/temp_storage_shared_worker_module.js",
+    "$root_out_dir/resources/inspector/timeline_module.js",
     "$root_out_dir/resources/inspector/devtools_extension_api.js",
   ] + gypi_values.devtools_standalone_files + gypi_values.devtools_cm_css_files
 
@@ -288,7 +290,7 @@ template("concatenate_module_scripts") {
     input = "front_end/" + module_name + "/module.json"
     inputs = [ input ] + invoker.imported_files
 
-    output = "$root_out_dir/resources/inspector/" + module_name + ".js"
+    output = "$root_out_dir/resources/inspector/" + module_name + "_module.js"
     outputs = [ output ]
 
     args = [