Backed out changeset f972a227ac15 (bug 1367424) for failing test_chrome_ext_hybrid_addons.html on Android. r=backout

devtools/client/framework/devtools.js

@@ -16,11 +16,6 @@ loader.lazyRequireGetter(this, "ToolboxHostManager", "devtools/client/framework/
 loader.lazyRequireGetter(this, "gDevToolsBrowser", "devtools/client/framework/devtools-browser", true);
 loader.lazyImporter(this, "ScratchpadManager", "resource://devtools/client/scratchpad/scratchpad-manager.jsm");
 
-// Dependencies required for addon sdk compatibility layer.
-loader.lazyRequireGetter(this, "DebuggerServer", "devtools/server/main", true);
-loader.lazyRequireGetter(this, "DebuggerClient", "devtools/shared/client/main", true);
-loader.lazyImporter(this, "BrowserToolboxProcess", "resource://devtools/client/framework/ToolboxProcess.jsm");
-
 const {defaultTools: DefaultTools, defaultThemes: DefaultThemes} =
   require("devtools/client/definitions");
 const EventEmitter = require("devtools/shared/event-emitter");
@@ -538,42 +533,6 @@ DevTools.prototype = {
     return TargetFactory.forTab(tab);
   },
 
-  /**
-   * Compatibility layer for addon-sdk. Remove when Firefox 57 hits release.
-   * Initialize the debugger server if needed and and create a connection.
-   *
-   * @return {DebuggerTransport} a client-side DebuggerTransport for communicating with
-   *         the created connection.
-   */
-  connectDebuggerServer: function () {
-    if (!DebuggerServer.initialized) {
-      DebuggerServer.init();
-      DebuggerServer.addBrowserActors();
-    }
-
-    return DebuggerServer.connectPipe();
-  },
-
-  /**
-   * Compatibility layer for addon-sdk. Remove when Firefox 57 hits release.
-   *
-   * Create a connection to the debugger server and return a debugger client for this
-   * new connection.
-   */
-  createDebuggerClient: function () {
-    let transport = this.connectDebuggerServer();
-    return new DebuggerClient(transport);
-  },
-
-  /**
-   * Compatibility layer for addon-sdk. Remove when Firefox 57 hits release.
-   *
-   * Create a BrowserToolbox process linked to the provided addon id.
-   */
-  initBrowserToolboxProcessForAddon: function (addonID) {
-    BrowserToolboxProcess.init({ addonID });
-  },
-
   /**
    * Either the SDK Loader has been destroyed by the add-on contribution
    * workflow, or firefox is shutting down.

devtools/shim/DevToolsShim.jsm

@@ -196,30 +196,3 @@ this.DevToolsShim = {
     this.themes = [];
   },
 };
-
-/**
- * Compatibility layer for addon-sdk. Remove when Firefox 57 hits release.
- *
- * The methods below are used by classes and tests from addon-sdk/
- * If DevTools are not installed when calling one of them, the call will throw.
- */
-
-let addonSdkMethods = [
-  "closeToolbox",
-  "connectDebuggerServer",
-  "createDebuggerClient",
-  "getTargetForTab",
-  "getToolbox",
-  "initBrowserToolboxProcessForAddon",
-  "showToolbox",
-];
-
-for (let method of addonSdkMethods) {
-  this.DevToolsShim[method] = function () {
-    if (!this.isInstalled()) {
-      throw new Error(`Method ${method} unavailable if DevTools are not installed`);
-    }
-
-    return this.gDevTools[method].apply(this.gDevTools, arguments);
-  };
-}