Backed out changeset e00fb04fe1ef (bug 1188413) for OSX devtools failures.

browser/devtools/framework/toolbox.js

@@ -501,11 +501,6 @@ Toolbox.prototype = {
     let toggleKey = this.doc.getElementById("toolbox-toggle-host-key");
     toggleKey.addEventListener("command", this.switchToPreviousHost.bind(this), true);
 
-    if (Services.prefs.prefHasUserValue("devtools.loader.srcdir")) {
-      let reloadKey = this.doc.getElementById("tools-reload-key");
-      reloadKey.addEventListener("command", this.reload.bind(this), true);
-    }
-
     // Split console uses keypress instead of command so the event can be
     // cancelled with stopPropagation on the keypress, and not preventDefault.
     this.doc.addEventListener("keypress", this._splitConsoleOnKeypress, false);
@@ -1587,11 +1582,6 @@ Toolbox.prototype = {
     return newHost;
   },
 
-  reload: function () {
-    const {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-    devtools.reload(true);
-  },
-
   /**
    * Switch to the last used host for the toolbox UI.
    * This is determined by the devtools.toolbox.previousHost pref.

browser/devtools/framework/toolbox.xul

@@ -78,10 +78,6 @@
          key="&toolboxToggle.key;"
          oncommand="void(0);"
          modifiers="accel shift"/>
-    <key id="tools-reload-key"
-         keycode="&toolboxReload.key;"
-         oncommand="void(0);"
-         modifiers="accel alt"/>
   </keyset>
 
   <popupset>

browser/devtools/shared/DeveloperToolbar.jsm

@@ -70,9 +70,6 @@ let CommandUtils = {
    * Utility to ensure that things are loaded in the correct order
    */
   createRequisition: function(target, options) {
-    if (!gcliInit) {
-      return promise.reject("Unable to load gcli");
-    }
     return gcliInit.getSystem(target).then(system => {
       var Requisition = require("gcli/cli").Requisition;
       return new Requisition(system, options);

toolkit/devtools/Loader.jsm

@@ -432,7 +432,7 @@ DevToolsLoader.prototype = {
   /**
    * Reload the current provider.
    */
-  reload: function(showToolbox) {
+  reload: function() {
     var events = this.require("sdk/system/events");
     events.emit("startupcache-invalidate", {});
     events.emit("devtools-unloaded", {});
@@ -442,14 +442,6 @@ DevToolsLoader.prototype = {
     delete this._mainid;
     this._chooseProvider();
     this.main("main");
-
-    // Reopen the toolbox automatically if requested
-    if (showToolbox) {
-      let { gBrowser } = Services.wm.getMostRecentWindow("navigator:browser");
-      let target = this.TargetFactory.forTab(gBrowser.selectedTab);
-      const { gDevTools } = this.require("resource:///modules/devtools/gDevTools.jsm");
-      gDevTools.showToolbox(target);
-    }
   },
 
   /**