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

Source/devtools/devtools.gypi

 #
 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #         * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #         * Redistributions in binary form must reproduce the above
@@ skipping 22 matching lines @@
         # If debug_devtools is set to 1, JavaScript files for DevTools are
         # stored as is. Otherwise, a concatenated file is stored.
         'debug_devtools%': 0,
         # This list should contain all "autostart" modules from all apps.
         'devtools_core_files': [
             '<@(devtools_bindings_js_files)',
             '<@(devtools_common_js_files)',
             '<@(devtools_components_js_files)',
             '<@(devtools_core_base_files)',
             '<@(devtools_host_js_files)',
-            '<@(devtools_main_js_files)',
             '<@(devtools_screencast_js_files)',
             '<@(devtools_sdk_js_files)',
             '<@(devtools_toolbox_bootstrap_js_files)',
             '<@(devtools_toolbox_js_files)',
             '<@(devtools_ui_js_files)',
             '<@(devtools_workspace_js_files)',
         ],
         'devtools_core_base_files': [
             'front_end/devtools.js',
             'front_end/devtools.json',
             'front_end/devtools.css',
             'front_end/toolbox.js',
             'front_end/toolbox.json',
             'front_end/toolbox.css',
             'front_end/Runtime.js',
             'front_end/Tests.js',
             'front_end/TestController.js',
             'front_end/dialog.css',
             'front_end/inspectorStyle.css',
             'front_end/popover.css',
             'front_end/sidebarPane.css',
             'front_end/splitView.css',
             'front_end/suggestBox.css',
             'front_end/tabbedPane.css',
+            '<@(devtools_main_js_files)',
             '<@(devtools_standalone_files)',
         ],
         'devtools_common_js_files': [
             'front_end/common/Color.js',
             'front_end/common/Console.js',
             'front_end/common/ContentProvider.js',
             'front_end/common/Geometry.js',
             'front_end/common/Lock.js',
             'front_end/common/ModuleExtensionInterfaces.js',
             'front_end/common/NotificationService.js',
@@ skipping 368 matching lines @@
             'front_end/resources/ResourcesPanel.js',
         ],
         'devtools_script_formatter_worker_js_files': [
             'front_end/cm/css.js',
             'front_end/cm/headlesscodemirror.js',
             'front_end/cm/htmlmixed.js',
             'front_end/cm/javascript.js',
             'front_end/cm/xml.js',
             'front_end/common/WebInspector.js',
             'front_end/common/utilities.js',
+            'front_end/common/utilities.js',
             'front_end/script_formatter_worker/CSSFormatter.js',
             'front_end/script_formatter_worker/JavaScriptFormatter.js',
             'front_end/script_formatter_worker/ScriptFormatterWorker.js',
         ],
         'devtools_settings_js_files': [
             'front_end/settings/EditFileSystemDialog.js',
             'front_end/settings/FrameworkBlackboxDialog.js',
             'front_end/settings/SettingsScreen.js',
         ],
         'devtools_source_frame_js_files': [
@@ skipping 101 matching lines @@
             '<@(devtools_documentation_js_files)',
             '<@(devtools_elements_js_files)',
             '<@(devtools_extensions_js_files)',
             '<@(devtools_heap_snapshot_worker_js_files)',
             '<@(devtools_layers_js_files)',
             '<@(devtools_network_js_files)',
             '<@(devtools_profiler_js_files)',
             '<@(devtools_promises_js_files)',
             '<@(devtools_resources_js_files)',
             '<@(devtools_script_formatter_worker_js_files)',
-            '<@(devtools_settings_js_files)',
             '<@(devtools_source_frame_js_files)',
             '<@(devtools_sources_js_files)',
             '<@(devtools_temp_storage_shared_worker_js_files)',
             '<@(devtools_timeline_js_files)',
         ],
         'devtools_image_files': [
             'front_end/Images/applicationCache.png',
             'front_end/Images/back.png',
             'front_end/Images/breakpoint.png',
             'front_end/Images/breakpoint_2x.png',
@@ skipping 60 matching lines @@
             'front_end/Images/touchCursor.png',
             'front_end/Images/touchCursor_2x.png',
             'front_end/Images/transformControls.png',
             'front_end/Images/transformControls_2x.png',
         ],
         'devtools_extension_api_files': [
             'front_end/extensions/ExtensionAPI.js',
         ],
     },
 }