Revert of DevTools: Fix debug_devtools=1 mode "main" extensions loading after r182328

Source/devtools/front_end/Runtime.js

 /*
  * Copyright (C) 2014 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 227 matching lines @@
 
     /**
      * @param {string} moduleName
      */
     _registerModule: function(moduleName)
     {
         if (!this._descriptorsMap[moduleName]) {
             var content;
             // FIXME: This is a temp workaround to avoid core module loading attempts in the release mode.
             // It should be removed when the new application loader is implemented.
-            if (moduleName === "main" || !this._coreModules.hasOwnProperty(moduleName))
+            if (!this._coreModules.hasOwnProperty(moduleName))
                 content = loadResource(moduleName + "/module.json");
             else
                 content = "{}";
 
             if (!content)
                 throw new Error("Module is not defined: " + moduleName + " " + new Error().stack);
 
             var module = /** @type {!Runtime.ModuleDescriptor} */ (self.eval("(" + content + ")"));
             module["name"] = moduleName;
             this._descriptorsMap[moduleName] = module;
@@ skipping 258 matching lines @@
  */
 Runtime.Module = function(manager, descriptor)
 {
     this._manager = manager;
     this._descriptor = descriptor;
     this._name = descriptor.name;
     var extensions = /** @type {?Array.<!Runtime.ExtensionDescriptor>}*/ (descriptor.extensions);
     for (var i = 0; extensions && i < extensions.length; ++i)
         this._manager._extensions.push(new Runtime.Extension(this, extensions[i]));
     this._loaded = false;
-
-    // FIXME: This is a temp workaround to avoid core module loading attempts in the release mode.
-    // It should be removed when the new application loader is implemented.
-    if (this._manager._coreModules.hasOwnProperty(this._name))
-        this._loaded = true;
 }
 
 Runtime.Module.prototype = {
     /**
      * @return {string}
      */
     name: function()
     {
         return this._name;
     },
@@ skipping 10 matching lines @@
             Error.stackTraceLimit = oldStackTraceLimit;
             return;
         }
 
         this._isLoading = true;
         var dependencies = this._descriptor.dependencies;
         for (var i = 0; dependencies && i < dependencies.length; ++i)
             this._manager.loadModule(dependencies[i]);
         if (this._descriptor.scripts) {
             if (Runtime.isReleaseMode()) {
-                loadScript(this._name + ".js");
+                // FIXME: This is a temp workaround to avoid core module loading attempts in the release mode.
+                // It should be removed when the new application loader is implemented.
+                if (!this._manager._coreModules.hasOwnProperty(this._name))
+                    loadScript(this._name + ".js");
             } else {
                 var scripts = this._descriptor.scripts;
                 for (var i = 0; i < scripts.length; ++i)
                     loadScript(this._name + "/" + scripts[i]);
             }
         }
         this._isLoading = false;
         this._loaded = true;
     }
 }
@@ skipping 71 matching lines @@
             this._instance = new constructorFunction();
         }
         return this._instance;
     }
 }
 
 /**
  * @type {!Runtime}
  */
 var runtime;