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

Source/devtools/scripts/concatenate_application_code.py

 #!/usr/bin/env python
 #
 # 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.
 
 """
 Concatenates autostart modules, application modules' module.json descriptors,
 and the application loader into a single script.
 Also concatenates all workers' dependencies into individual worker loader scripts.
@@ skipping 62 matching lines @@
     write_file(path.join(output_dir, application_loader_name), minify_if_needed(output.getvalue(), minify))
     output.close()
 
 
 def concatenate_worker(module_name, descriptors, application_dir, output_dir, minify):
     descriptor = descriptors.modules[module_name]
     scripts = descriptor.get('scripts')
     if not scripts:
         return
     worker_dir = path.join(application_dir, module_name)
-    output_file_path = path.join(output_dir, module_name, module_name + '_module.js')
+    output_file_path = path.join(output_dir, module_name, module_name + '.js')
 
     output = StringIO()
     output.write('/* Worker %s */\n' % module_name)
     output.write('/* Runtime.js */\n')
     output.write(read_file(path.join(application_dir, 'Runtime.js')))
     dependencies = descriptors.sorted_dependencies_closure(module_name)
     dep_descriptors = []
     for dep_name in dependencies:
         dep_descriptor = descriptors.modules[dep_name]
         dep_descriptors.append(dep_descriptor)
         scripts = dep_descriptor.get('scripts')
         if scripts:
             output.write('\n/* Module %s */\n' % dep_name)
             modular_build.concatenate_scripts(scripts, path.join(application_dir, dep_name), output_dir, output)
 
+    output.write('\n/* Initialize worker */\n')
+    # Tell Runtime we are in the compiled mode.
+    output.write('allDescriptors = ')
+    output.write(json.dumps(dep_descriptors))
+    output.write(';\nRuntime.initializeWorker("%s");' % module_name)
+
     write_file(output_file_path, minify_if_needed(output.getvalue(), minify))
     output.close()
 
 
 def build_application(application_name, loader, application_dir, output_dir, minify):
     descriptors = loader.load_application(application_name + '.json')
     concatenate_application_script(application_name, descriptors, application_dir, output_dir, minify)
     for module in filter(lambda desc: desc.get('type') == 'worker', descriptors.application.values()):
         concatenate_worker(module['name'], descriptors, application_dir, output_dir, minify)