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

Source/devtools/BUILD.gn

 # 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.
 
 gypi_values = exec_script(
     "//build/gypi_to_gn.py",
     [ rebase_path("devtools.gypi") ],
     "scope",
     [ "devtools.gypi" ])
 
 # 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_standalone_files
+] + gypi_values.devtools_main_js_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_ui_js_files +
-  gypi_values.devtools_workspace_js_files
+  gypi_values.devtools_toolbox_bootstrap_js_files
 
 devtools_extensions_js_files = gypi_values.devtools_extensions_js_files -
   [ "<@(devtools_extension_api_files)" ] +
   gypi_values.devtools_extension_api_files
 
 #-------------------------------------------------------------------------------
 
 visibility = [ "//third_party/WebKit/*" ]
 
 # Probably need to parameterize this. If we set it to true, there will be some
@@ skipping 27 matching lines @@
 action("generate_devtools_grd") {
   script = "scripts/generate_devtools_grd.py"
 
   input_pages = [
     "$root_out_dir/resources/inspector/devtools.css",
     "$root_out_dir/resources/inspector/devtools.html",
     "$root_out_dir/resources/inspector/devtools.js",
     "$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_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/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/devtools_extension_api.js",
   ] + gypi_values.devtools_standalone_files + gypi_values.devtools_cm_css_files
 
   images = gypi_values.devtools_image_files
   images_path = "front_end/Images"
 
   inputs = input_pages + images
 
   outfile = "$root_gen_dir/devtools/devtools_resources.grd"
   outputs = [ outfile ]
@@ skipping 178 matching lines @@
   assert(defined(invoker.module_name), target_name)
   assert(defined(invoker.imported_files), target_name)
 
   action(target_name) {
     script = "scripts/concatenate_module_scripts.py"
     module_name = invoker.module_name
 
     input = "front_end/" + module_name + "/module.json"
     inputs = [ input ] + invoker.imported_files
 
-    output = "$root_out_dir/resources/inspector/" + module_name + "_module.js"
+    output = "$root_out_dir/resources/inspector/" + module_name + ".js"
     outputs = [ output ]
 
     args = [
       rebase_path(input, root_build_dir),
       rebase_path(output, root_build_dir),
     ]
   }
 }
 
 concatenate_module_scripts("build_audits_module") {
@@ skipping 129 matching lines @@
   }
 }
 
 concatenate_css("concatenated_devtools_css") {
   app_name = "devtools"
 }
 
 concatenate_css("concatenated_toolbox_css") {
   app_name = "toolbox"
 }