diff --git a/.eslintignore b/.eslintignore
index 3c8a9c3b2323..6d7a3853822e 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -116,16 +116,9 @@ devtools/server/tests/browser/**
 !devtools/server/tests/browser/browser_webextension_inspected_window.js
 devtools/server/tests/mochitest/**
 devtools/server/tests/unit/**
-devtools/shared/apps/**
-devtools/shared/gcli/**
-!devtools/shared/gcli/templater.js
 devtools/shared/heapsnapshot/**
-devtools/shared/transport/**
-!devtools/shared/transport/transport.js
-!devtools/shared/transport/websocket-transport.js
+devtools/shared/transport/tests/unit/**
 devtools/shared/webconsole/test/**
-devtools/shared/worker/**
-!devtools/shared/worker/worker.js
 
 # Ignore devtools pre-processed files
 devtools/client/framework/toolbox-process-window.js
@@ -136,7 +129,7 @@ devtools/client/preferences/**
 # Ignore devtools third-party libs
 devtools/shared/jsbeautify/*
 devtools/shared/acorn/*
-devtools/client/sourceeditor/tern/*
+devtools/shared/gcli/source/*
 devtools/shared/node-properties/*
 devtools/shared/pretty-fast/*
 devtools/shared/sourcemap/*
@@ -147,6 +140,7 @@ devtools/client/shared/demangle.js
 devtools/client/shared/vendor/*
 devtools/client/sourceeditor/codemirror/*.js
 devtools/client/sourceeditor/codemirror/**/*.js
+devtools/client/sourceeditor/tern/*
 devtools/client/sourceeditor/test/cm_mode_ruby.js
 devtools/client/sourceeditor/test/codemirror/*
 devtools/client/inspector/markup/test/lib_*
diff --git a/devtools/.eslintrc.js b/devtools/.eslintrc.js
index 31d6adacaba6..865b79ab5166 100644
--- a/devtools/.eslintrc.js
+++ b/devtools/.eslintrc.js
@@ -273,7 +273,7 @@ module.exports = {
     // Disallow declaring the same variable more than once (we use let anyway).
     "no-redeclare": "error",
     // Disallow multiple spaces in a regular expression literal.
-    "no-regex-spaces": "error",
+    "no-regex-spaces": "off",
     // Allow reserved words being used as object literal keys.
     "no-reserved-keys": "off",
     // Don't restrict usage of specified node modules (not a node environment).
diff --git a/devtools/shared/apps/Devices.jsm b/devtools/shared/apps/Devices.jsm
index d3390b34b996..16206070ecc5 100644
--- a/devtools/shared/apps/Devices.jsm
+++ b/devtools/shared/apps/Devices.jsm
@@ -6,6 +6,8 @@
 
 Components.utils.import("resource://devtools/shared/event-emitter.js");
 
+/* exported EXPORTED_SYMBOLS */
+
 const EXPORTED_SYMBOLS = ["Devices"];
 
 var addonInstalled = false;
diff --git a/devtools/shared/apps/app-actor-front.js b/devtools/shared/apps/app-actor-front.js
index 6cd7936797c2..2ce0ad84247d 100644
--- a/devtools/shared/apps/app-actor-front.js
+++ b/devtools/shared/apps/app-actor-front.js
@@ -37,8 +37,7 @@ function addDirToZip(writer, dir, basePath) {
 
     if (file.isHidden() ||
         file.isSpecial() ||
-        file.equals(writer.file))
-    {
+        file.equals(writer.file)) {
       continue;
     }
 
@@ -62,12 +61,15 @@ function addDirToZip(writer, dir, basePath) {
  */
 function getResultText(code) {
   let regexp =
-    /^\[Exception... "(.*)"  nsresult: "0x[0-9a-fA-F]* \((.*)\)"  location: ".*"  data: .*\]$/;
-  let ex = Cc["@mozilla.org/js/xpc/Exception;1"].
-           createInstance(Ci.nsIXPCException);
+    /^\[Exception... "(.*)"  nsresult: "0x[0-9a-fA-F]* \((.*)\)"  location: ".*"  data: .*\]$/; // eslint-disable-line
+  let ex = Cc["@mozilla.org/js/xpc/Exception;1"]
+           .createInstance(Ci.nsIXPCException);
   ex.initialize(null, code, null, null, null, null);
   let [, message, name] = regexp.exec(ex.toString());
-  return { name: name, message: message };
+  return {
+    name,
+    message
+  };
 }
 
 function zipDirectory(zipFile, dirToArchive) {
@@ -75,7 +77,7 @@ function zipDirectory(zipFile, dirToArchive) {
   let writer = Cc["@mozilla.org/zipwriter;1"].createInstance(Ci.nsIZipWriter);
   writer.open(zipFile, PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE);
 
-  this.addDirToZip(writer, dirToArchive, "");
+  addDirToZip(writer, dirToArchive, "");
 
   writer.processQueue({
     onStartRequest: function onStartRequest(request, context) {},
@@ -83,8 +85,7 @@ function zipDirectory(zipFile, dirToArchive) {
       if (status == Cr.NS_OK) {
         writer.close();
         deferred.resolve(zipFile);
-      }
-      else {
+      } else {
         let { name, message } = getResultText(status);
         deferred.reject(name + ": " + message);
       }
@@ -97,9 +98,8 @@ function zipDirectory(zipFile, dirToArchive) {
 function uploadPackage(client, webappsActor, packageFile, progressCallback) {
   if (client.traits.bulk) {
     return uploadPackageBulk(client, webappsActor, packageFile, progressCallback);
-  } else {
-    return uploadPackageJSON(client, webappsActor, packageFile, progressCallback);
   }
+  return uploadPackageJSON(client, webappsActor, packageFile, progressCallback);
 }
 
 function uploadPackageJSON(client, webappsActor, packageFile, progressCallback) {
@@ -125,48 +125,45 @@ function uploadPackageJSON(client, webappsActor, packageFile, progressCallback)
 
   function openFile(actor) {
     let openedFile;
-    OS.File.open(packageFile.path)
-      .then(file => {
-        openedFile = file;
-        return openedFile.stat();
-      })
-      .then(fileInfo => {
-        fileSize = fileInfo.size;
-        emitProgress();
-        uploadChunk(actor, openedFile);
-      });
+    OS.File.open(packageFile.path).then(file => {
+      openedFile = file;
+      return openedFile.stat();
+    }).then(fileInfo => {
+      fileSize = fileInfo.size;
+      emitProgress();
+      uploadChunk(actor, openedFile);
+    });
   }
   function uploadChunk(actor, file) {
-    file.read(CHUNK_SIZE)
-        .then(function (bytes) {
-          bytesRead += bytes.length;
-          emitProgress();
-          // To work around the fact that JSON.stringify translates the typed
-          // array to object, we are encoding the typed array here into a string
-          let chunk = String.fromCharCode.apply(null, bytes);
+    file.read(CHUNK_SIZE).then(function (bytes) {
+      bytesRead += bytes.length;
+      emitProgress();
+      // To work around the fact that JSON.stringify translates the typed
+      // array to object, we are encoding the typed array here into a string
+      let chunk = String.fromCharCode.apply(null, bytes);
 
-          let request = {
-            to: actor,
-            type: "chunk",
-            chunk: chunk
-          };
-          client.request(request, (res) => {
-            if (bytes.length == CHUNK_SIZE) {
-              uploadChunk(actor, file);
-            } else {
-              file.close().then(function () {
-                endsUpload(actor);
-              });
-            }
+      let chunkRequest = {
+        to: actor,
+        type: "chunk",
+        chunk,
+      };
+      client.request(chunkRequest, (res) => {
+        if (bytes.length == CHUNK_SIZE) {
+          uploadChunk(actor, file);
+        } else {
+          file.close().then(function () {
+            endsUpload(actor);
           });
-        });
+        }
+      });
+    });
   }
   function endsUpload(actor) {
-    let request = {
+    let doneRequest = {
       to: actor,
       type: "done"
     };
-    client.request(request, (res) => {
+    client.request(doneRequest, (res) => {
       deferred.resolve(actor);
     });
   }
@@ -190,13 +187,13 @@ function uploadPackageBulk(client, webappsActor, packageFile, progressCallback)
     let fileSize = packageFile.fileSize;
     console.log("File size: " + fileSize);
 
-    let request = client.startBulkRequest({
+    let streamRequest = client.startBulkRequest({
       actor: actor,
       type: "stream",
       length: fileSize
     });
 
-    request.on("bulk-send-ready", ({copyFrom}) => {
+    streamRequest.on("bulk-send-ready", ({copyFrom}) => {
       NetUtil.asyncFetch({
         uri: NetUtil.newURI(packageFile),
         loadUsingSystemPrincipal: true
@@ -245,36 +242,37 @@ function installPackaged(client, webappsActor, packagePath, appId, progressCallb
     packagePromise = promise.resolve(file);
   }
   packagePromise.then((zipFile) => {
-    uploadPackage(client, webappsActor, zipFile, progressCallback)
-        .then((fileActor) => {
-          let request = {
-            to: webappsActor,
-            type: "install",
-            appId: appId,
-            upload: fileActor
-          };
-          client.request(request, (res) => {
-            // If the install method immediatly fails,
-            // reject immediatly the installPackaged promise.
-            // Otherwise, wait for webappsEvent for completion
-            if (res.error) {
-              deferred.reject(res);
-            }
-            if ("error" in res)
-              deferred.reject({error: res.error, message: res.message});
-            else
-              deferred.resolve({appId: res.appId});
-          });
-          // Ensure deleting the temporary package file, but only if that a temporary
-          // package created when we pass a directory as `packagePath`
-          if (zipFile != file)
-            zipFile.remove(false);
-          // In case of success or error, ensure deleting the temporary package file
-          // also created on the device, but only once install request is done
-          deferred.promise.then(
-            () => removeServerTemporaryFile(client, fileActor),
-            () => removeServerTemporaryFile(client, fileActor));
-        });
+    uploadPackage(client, webappsActor, zipFile, progressCallback).then((fileActor) => {
+      let request = {
+        to: webappsActor,
+        type: "install",
+        appId: appId,
+        upload: fileActor
+      };
+      client.request(request, (res) => {
+        // If the install method immediatly fails,
+        // reject immediatly the installPackaged promise.
+        // Otherwise, wait for webappsEvent for completion
+        if (res.error) {
+          deferred.reject(res);
+        }
+        if ("error" in res) {
+          deferred.reject({error: res.error, message: res.message});
+        } else {
+          deferred.resolve({appId: res.appId});
+        }
+      });
+      // Ensure deleting the temporary package file, but only if that a temporary
+      // package created when we pass a directory as `packagePath`
+      if (zipFile != file) {
+        zipFile.remove(false);
+      }
+      // In case of success or error, ensure deleting the temporary package file
+      // also created on the device, but only once install request is done
+      deferred.promise.then(
+        () => removeServerTemporaryFile(client, fileActor),
+        () => removeServerTemporaryFile(client, fileActor));
+    });
   });
   return deferred.promise;
 }
@@ -293,10 +291,11 @@ function installHosted(client, webappsActor, appId, metadata, manifest) {
     if (res.error) {
       deferred.reject(res);
     }
-    if ("error" in res)
+    if ("error" in res) {
       deferred.reject({error: res.error, message: res.message});
-    else
+    } else {
       deferred.resolve({appId: res.appId});
+    }
   });
   return deferred.promise;
 }
@@ -307,8 +306,9 @@ function getTargetForApp(client, webappsActor, manifestURL) {
   // of the same app in order to show only one toolbox per app and
   // avoid re-creating lot of objects twice.
   let existingTarget = appTargets.get(manifestURL);
-  if (existingTarget)
+  if (existingTarget) {
     return promise.resolve(existingTarget);
+  }
 
   let deferred = defer();
   let request = {
@@ -343,23 +343,22 @@ function getTargetForApp(client, webappsActor, manifestURL) {
 exports.getTargetForApp = getTargetForApp;
 
 function reloadApp(client, webappsActor, manifestURL) {
-  return getTargetForApp(client,
-                         webappsActor,
-                         manifestURL).
-    then((target) => {
-      // Request the ContentActor to reload the app
-      let request = {
-        to: target.form.actor,
-        type: "reload",
-        options: {
-          force: true
-        },
-        manifestURL: manifestURL
-      };
-      return client.request(request);
-    }, () => {
-      throw new Error("Not running");
-    });
+  return getTargetForApp(
+    client, webappsActor, manifestURL
+  ).then((target) => {
+    // Request the ContentActor to reload the app
+    let request = {
+      to: target.form.actor,
+      type: "reload",
+      options: {
+        force: true
+      },
+      manifestURL,
+    };
+    return client.request(request);
+  }, () => {
+    throw new Error("Not running");
+  });
 }
 exports.reloadApp = reloadApp;
 
@@ -423,25 +422,26 @@ App.prototype = {
       type: "getAppActor",
       manifestURL: this.manifest.manifestURL
     };
-    return this.client.request(request)
-                      .then(res => {
-                        return this._form = res.actor;
-                      });
+    return this.client.request(request).then(res => {
+      this._form = res.actor;
+      return this._form;
+    });
   },
 
   getTarget: function () {
     if (this._target) {
       return promise.resolve(this._target);
     }
-    return this.getForm().
-      then((form) => getTarget(this.client, form)).
-      then((target) => {
-        target.on("close", () => {
-          delete this._form;
-          delete this._target;
-        });
-        return this._target = target;
+    return this.getForm().then(
+      (form) => getTarget(this.client, form)
+    ).then((target) => {
+      target.on("close", () => {
+        delete this._form;
+        delete this._target;
       });
+      this._target = target;
+      return this._target;
+    });
   },
 
   launch: function () {
@@ -487,7 +487,6 @@ App.prototype = {
   }
 };
 
-
 /**
  * `AppActorFront` is a client for the webapps actor.
  */
@@ -537,23 +536,21 @@ AppActorFront.prototype = {
     let app = this._apps ? this._apps.get(manifestURL) : null;
     if (app) {
       return promise.resolve(app);
-    } else {
-      let request = {
-        to: this.actor,
-        type: "getApp",
-        manifestURL: manifestURL
-      };
-      return this.client.request(request)
-                 .then(res => {
-                   let app = new App(this.client, this.actor, res.app);
-                   if (this._apps) {
-                     this._apps.set(manifestURL, app);
-                   }
-                   return app;
-                 }, e => {
-                   console.error("Unable to retrieve app", manifestURL, e);
-                 });
     }
+    let request = {
+      to: this.actor,
+      type: "getApp",
+      manifestURL,
+    };
+    return this.client.request(request).then(res => {
+      app = new App(this.client, this.actor, res.app);
+      if (this._apps) {
+        this._apps.set(manifestURL, app);
+      }
+      return app;
+    }, e => {
+      console.error("Unable to retrieve app", manifestURL, e);
+    });
   },
 
   /**
@@ -583,47 +580,42 @@ AppActorFront.prototype = {
       to: this.actor,
       type: "getAll"
     };
-    return this._loadingPromise = this.client.request(request)
-      .then(res => {
-        delete this._loadingPromise;
-        this._apps = new Map();
-        for (let a of res.apps) {
-          let app = new App(this.client, this.actor, a);
-          this._apps.set(a.manifestURL, app);
-        }
-      })
-      .then(() => {
-        // Then retrieve all running apps in order to flag them as running
-        let request = {
-          to: this.actor,
-          type: "listRunningApps"
-        };
-        return this.client.request(request)
-                   .then(res => res.apps);
-      })
-      .then(apps => {
-        let promises = apps.map(manifestURL => {
-          // _getApp creates `App` instance and register it to AppActorFront
-          return this._getApp(manifestURL)
-                      .then(app => {
-                        app.running = true;
-                        // Fake appOpen event for all already opened
-                        this._notifyListeners("appOpen", app);
-                      });
+    this._loadingPromise = this.client.request(request).then(res => {
+      delete this._loadingPromise;
+      this._apps = new Map();
+      for (let a of res.apps) {
+        let app = new App(this.client, this.actor, a);
+        this._apps.set(a.manifestURL, app);
+      }
+    }).then(() => {
+      // Then retrieve all running apps in order to flag them as running
+      let listRequest = {
+        to: this.actor,
+        type: "listRunningApps"
+      };
+      return this.client.request(listRequest).then(res => res.apps);
+    }).then(apps => {
+      let promises = apps.map(manifestURL => {
+        // _getApp creates `App` instance and register it to AppActorFront
+        return this._getApp(manifestURL).then(app => {
+          app.running = true;
+          // Fake appOpen event for all already opened
+          this._notifyListeners("appOpen", app);
         });
-        return promise.all(promises);
-      })
-      .then(() => {
-        // Finally ask to receive all app events
-        return this._listenAppEvents(listener);
       });
+      return promise.all(promises);
+    }).then(() => {
+      // Finally ask to receive all app events
+      return this._listenAppEvents(listener);
+    });
+    return this._loadingPromise;
   },
 
   fetchIcons: function () {
     // On demand, retrieve apps icons in order to be able
     // to synchronously retrieve it on `App` objects
     let promises = [];
-    for (let [manifestURL, app] of this._apps) {
+    for (let [, app] of this._apps) {
       promises.push(app.getIcon());
     }
 
@@ -708,16 +700,15 @@ AppActorFront.prototype = {
             to: this.actor,
             type: "listRunningApps"
           };
-          this.client.request(request)
-              .then(res => {
-                if (res.apps.indexOf(manifestURL) !== -1) {
-                  app.running = true;
-                  this._notifyListeners("appInstall", app);
-                  this._notifyListeners("appOpen", app);
-                } else {
-                  this._notifyListeners("appInstall", app);
-                }
-              });
+          this.client.request(request).then(res => {
+            if (res.apps.indexOf(manifestURL) !== -1) {
+              app.running = true;
+              this._notifyListeners("appInstall", app);
+              this._notifyListeners("appOpen", app);
+            } else {
+              this._notifyListeners("appInstall", app);
+            }
+          });
           break;
         case "appUninstall":
           // Fake a appClose event if we didn't got one before uninstall
@@ -796,22 +787,19 @@ AppActorFront.prototype = {
         }
       }
     };
-    this._listenAppEvents(listener)
-        // Execute the request
-        .then(request)
-        .then(response => {
-          finalAppId = response.appId;
-          manifestURL = response.manifestURL;
+    // Execute the request
+    this._listenAppEvents(listener).then(request).then(response => {
+      finalAppId = response.appId;
+      manifestURL = response.manifestURL;
 
-          // Resolves immediately if the appInstall event
-          // was dispatched during the request.
-          if (manifestURL in installs) {
-            resolve(installs[manifestURL]);
-          }
-        }, deferred.reject);
+      // Resolves immediately if the appInstall event
+      // was dispatched during the request.
+      if (manifestURL in installs) {
+        resolve(installs[manifestURL]);
+      }
+    }, deferred.reject);
 
     return deferred.promise;
-
   },
 
   /*
@@ -826,12 +814,12 @@ AppActorFront.prototype = {
     let manifestURL = metadata.manifestURL ||
                       metadata.origin + "/manifest.webapp";
     let request = () => {
-      return installHosted(this.client, this.actor, appId, metadata,
-                           manifest)
-        .then(response => ({
-          appId: response.appId,
-          manifestURL: manifestURL
-        }));
+      return installHosted(
+        this.client, this.actor, appId, metadata, manifest
+      ).then(response => ({
+        appId: response.appId,
+        manifestURL: manifestURL
+      }));
     };
     return this._install(request);
   }
diff --git a/devtools/shared/gcli/commands/addon.js b/devtools/shared/gcli/commands/addon.js
index 824cf7f04911..74d8d405c8af 100644
--- a/devtools/shared/gcli/commands/addon.js
+++ b/devtools/shared/gcli/commands/addon.js
@@ -15,8 +15,7 @@ function getAddonManager() {
       AddonManager: require("resource://gre/modules/AddonManager.jsm").AddonManager,
       addonManagerActive: true
     };
-  }
-  catch (ex) {
+  } catch (ex) {
     // Fake up an AddonManager just enough to let the file load
     return {
       AddonManager: {
@@ -28,21 +27,15 @@ function getAddonManager() {
   }
 }
 
-const { Cc, Ci, Cu } = require("chrome");
 const { AddonManager, addonManagerActive } = getAddonManager();
 const l10n = require("gcli/l10n");
 
-const BRAND_SHORT_NAME = Cc["@mozilla.org/intl/stringbundle;1"]
-                           .getService(Ci.nsIStringBundleService)
-                           .createBundle("chrome://branding/locale/brand.properties")
-                           .GetStringFromName("brandShortName");
-
 /**
  * Takes a function that uses a callback as its last parameter, and returns a
  * new function that returns a promise instead.
  * This should probably live in async-util
  */
-const promiseify = function(scope, functionWithLastParamCallback) {
+const promiseify = function (scope, functionWithLastParamCallback) {
   return (...args) => {
     return new Promise(resolve => {
       args.push((...results) => {
@@ -50,7 +43,7 @@ const promiseify = function(scope, functionWithLastParamCallback) {
       });
       functionWithLastParamCallback.apply(scope, args);
     });
-  }
+  };
 };
 
 // Convert callback based functions to promise based ones
@@ -65,7 +58,7 @@ function pendingOperations(addon) {
     "PENDING_ENABLE", "PENDING_DISABLE", "PENDING_UNINSTALL",
     "PENDING_INSTALL", "PENDING_UPGRADE"
   ];
-  return allOperations.reduce(function(operations, opName) {
+  return allOperations.reduce(function (operations, opName) {
     return addon.pendingOperations & AddonManager[opName] ?
       operations.concat(opName) :
       operations;
@@ -79,15 +72,19 @@ var items = [
     parent: "selection",
     stringifyProperty: "name",
     cacheable: true,
-    constructor: function() {
+    constructor: function () {
       // Tell GCLI to clear the cache of addons when one is added or removed
       let listener = {
-        onInstalled: addon => { this.clearCache(); },
-        onUninstalled: addon => { this.clearCache(); },
+        onInstalled: addon => {
+          this.clearCache();
+        },
+        onUninstalled: addon => {
+          this.clearCache();
+        },
       };
       AddonManager.addAddonListener(listener);
     },
-    lookup: function() {
+    lookup: function () {
       return getAllAddons().then(addons => {
         return addons.map(addon => {
           let name = addon.name + " " + addon.version;
@@ -114,10 +111,10 @@ var items = [
       defaultValue: "all",
       description: l10n.lookup("addonListTypeDesc")
     }],
-    exec: function(args, context) {
+    exec: function (args, context) {
       let types = (args.type === "all") ? null : [ args.type ];
       return getAddonsByTypes(types).then(addons => {
-        addons = addons.map(function(addon) {
+        addons = addons.map(function (addon) {
           return {
             name: addon.name,
             version: addon.version,
@@ -133,7 +130,7 @@ var items = [
     item: "converter",
     from: "addonsInfo",
     to: "view",
-    exec: function(addonsInfo, context) {
+    exec: function (addonsInfo, context) {
       if (!addonsInfo.addons.length) {
         return context.createView({
           html: "<p>${message}</p>",
@@ -167,7 +164,7 @@ var items = [
       function arrangeAddons(addons) {
         let enabledAddons = [];
         let disabledAddons = [];
-        addons.forEach(function(addon) {
+        addons.forEach(function (addon) {
           if (addon.isActive) {
             enabledAddons.push(addon);
           } else {
@@ -208,7 +205,7 @@ var items = [
           "</table>",
         data: {
           header: header,
-          addons: arrangeAddons(addonsInfo.addons).map(function(addon) {
+          addons: arrangeAddons(addonsInfo.addons).map(function (addon) {
             return {
               name: addon.name,
               label: addon.name.replace(/\s/g, "_") +
@@ -220,7 +217,7 @@ var items = [
                  + addon.pendingOperations.map(lookupOperation).join(", ")
                  + ")") :
                 "",
-              toggleActionName: isActiveForToggle(addon) ? "disable": "enable",
+              toggleActionName: isActiveForToggle(addon) ? "disable" : "enable",
               toggleActionMessage: isActiveForToggle(addon) ?
                 l10n.lookup("addonListOutDisable") :
                 l10n.lookup("addonListOutEnable")
@@ -244,7 +241,7 @@ var items = [
         description: l10n.lookup("addonNameDesc")
       }
     ],
-    exec: function(args, context) {
+    exec: function (args, context) {
       let name = (args.addon.name + " " + args.addon.version).trim();
       if (args.addon.userDisabled) {
         args.addon.userDisabled = false;
@@ -266,7 +263,7 @@ var items = [
         description: l10n.lookup("addonNameDesc")
       }
     ],
-    exec: function(args, context) {
+    exec: function (args, context) {
       // If the addon is not disabled or is set to "click to play" then
       // disable it. Otherwise display the message "Add-on is already
       // disabled."
@@ -292,7 +289,7 @@ var items = [
         description: l10n.lookup("addonNameDesc")
       }
     ],
-    exec: function(args, context) {
+    exec: function (args, context) {
       let name = (args.addon.name + " " + args.addon.version).trim();
       if (args.addon.type !== "plugin") {
         return l10n.lookupFormat("addonCantCtp", [ name ]);
diff --git a/devtools/shared/gcli/commands/appcache.js b/devtools/shared/gcli/commands/appcache.js
index 0789fb5a077b..26815f76bd4a 100644
--- a/devtools/shared/gcli/commands/appcache.js
+++ b/devtools/shared/gcli/commands/appcache.js
@@ -32,7 +32,7 @@ exports.items = [
         }
       ]
     }],
-    exec: function(args, context) {
+    exec: function (args, context) {
       let utils;
       let deferred = context.defer();
 
@@ -42,7 +42,7 @@ exports.items = [
         utils = new AppCacheUtils(context.environment.document);
       }
 
-      utils.validateManifest().then(function(errors) {
+      utils.validateManifest().then(function (errors) {
         deferred.resolve([errors, utils.manifestURI || "-"]);
       });
 
@@ -53,7 +53,7 @@ exports.items = [
     item: "converter",
     from: "appcacheerrors",
     to: "view",
-    exec: function([errors, manifestURI], context) {
+    exec: function ([errors, manifestURI], context) {
       if (errors.length == 0) {
         return context.createView({
           html: "<span>" + l10n.lookup("appCacheValidatedSuccessfully") + "</span>"
@@ -81,7 +81,7 @@ exports.items = [
     name: "appcache clear",
     description: l10n.lookup("appCacheClearDesc"),
     manual: l10n.lookup("appCacheClearManual"),
-    exec: function(args, context) {
+    exec: function (args, context) {
       let utils = new AppCacheUtils(args.uri);
       utils.clearAll();
 
@@ -106,7 +106,7 @@ exports.items = [
         },
       ]
     }],
-    exec: function(args, context) {
+    exec: function (args, context) {
       let utils = new AppCacheUtils();
       return utils.listEntries(args.search);
     }
@@ -115,7 +115,7 @@ exports.items = [
     item: "converter",
     from: "appcacheentries",
     to: "view",
-    exec: function(entries, context) {
+    exec: function (entries, context) {
       return context.createView({
         html: "" +
           "<ul class='gcli-appcache-list'>" +
@@ -178,7 +178,7 @@ exports.items = [
         defaultValue: null,
       }
     ],
-    exec: function(args, context) {
+    exec: function (args, context) {
       let utils = new AppCacheUtils();
       return utils.viewEntry(args.key);
     }
diff --git a/devtools/shared/gcli/commands/calllog.js b/devtools/shared/gcli/commands/calllog.js
index c0f21aeab75d..a037e9c96677 100644
--- a/devtools/shared/gcli/commands/calllog.js
+++ b/devtools/shared/gcli/commands/calllog.js
@@ -27,11 +27,11 @@ exports.items = [
     name: "calllog start",
     description: l10n.lookup("calllogStartDesc"),
 
-    exec: function(args, context) {
+    exec: function (args, context) {
       let contentWindow = context.environment.window;
 
       let dbg = new Debugger(contentWindow);
-      dbg.onEnterFrame = function(frame) {
+      dbg.onEnterFrame = function (frame) {
         // BUG 773652 -  Make the output from the GCLI calllog command nicer
         contentWindow.console.log("Method call: " + this.callDescription(frame));
       }.bind(this);
@@ -45,12 +45,11 @@ exports.items = [
       return l10n.lookup("calllogStartReply");
     },
 
-    callDescription: function(frame) {
+    callDescription: function (frame) {
       let name = "<anonymous>";
       if (frame.callee.name) {
         name = frame.callee.name;
-      }
-      else {
+      } else {
         let desc = frame.callee.getOwnPropertyDescriptor("displayName");
         if (desc && desc.value && typeof desc.value == "string") {
           name = desc.value;
@@ -61,7 +60,7 @@ exports.items = [
       return name + "(" + args + ")";
     },
 
-    valueToString: function(value) {
+    valueToString: function (value) {
       if (typeof value !== "object" || value === null) {
         return uneval(value);
       }
@@ -74,7 +73,7 @@ exports.items = [
     name: "calllog stop",
     description: l10n.lookup("calllogStopDesc"),
 
-    exec: function(args, context) {
+    exec: function (args, context) {
       let numDebuggers = debuggers.length;
       if (numDebuggers == 0) {
         return l10n.lookup("calllogStopNoLogging");
@@ -111,7 +110,7 @@ exports.items = [
         manual: l10n.lookup("calllogChromeSourceTypeManual"),
       }
     ],
-    exec: function(args, context) {
+    exec: function (args, context) {
       let globalObj;
       let contentWindow = context.environment.window;
 
@@ -136,17 +135,16 @@ exports.items = [
         }
       } else {
         let chromeWin = context.environment.chromeDocument.defaultView;
-        let sandbox = new Cu.Sandbox(chromeWin,
-                                    {
-                                      sandboxPrototype: chromeWin,
-                                      wantXrays: false,
-                                      sandboxName: "gcli-cmd-calllog-chrome"
-                                    });
+        let sandbox = new Cu.Sandbox(chromeWin, {
+          sandboxPrototype: chromeWin,
+          wantXrays: false,
+          sandboxName: "gcli-cmd-calllog-chrome"
+        });
         let returnVal;
         try {
           returnVal = Cu.evalInSandbox(args.source, sandbox, "ECMAv5");
           sandboxes.push(sandbox);
-        } catch(e) {
+        } catch (e) {
           // We need to save the message before cleaning up else e contains a dead
           // object.
           let msg = l10n.lookup("callLogChromeEvalException") + ": " + e;
@@ -164,7 +162,7 @@ exports.items = [
       let dbg = new Debugger(globalObj);
       chromeDebuggers.push(dbg);
 
-      dbg.onEnterFrame = function(frame) {
+      dbg.onEnterFrame = function (frame) {
         // BUG 773652 -  Make the output from the GCLI calllog command nicer
         contentWindow.console.log(l10n.lookup("callLogChromeMethodCall") +
                                   ": " + this.callDescription(frame));
@@ -177,13 +175,14 @@ exports.items = [
       return l10n.lookup("calllogChromeStartReply");
     },
 
-    valueToString: function(value) {
-      if (typeof value !== "object" || value === null)
+    valueToString: function (value) {
+      if (typeof value !== "object" || value === null) {
         return uneval(value);
+      }
       return "[object " + value.class + "]";
     },
 
-    callDescription: function(frame) {
+    callDescription: function (frame) {
       let name = frame.callee.name || l10n.lookup("callLogChromeAnonFunction");
       let args = frame.arguments.map(this.valueToString).join(", ");
       return name + "(" + args + ")";
@@ -197,7 +196,7 @@ exports.items = [
     get hidden() {
       return gcli.hiddenByChromePref();
     },
-    exec: function(args, context) {
+    exec: function (args, context) {
       let numDebuggers = chromeDebuggers.length;
       if (numDebuggers == 0) {
         return l10n.lookup("calllogChromeStopNoLogging");
diff --git a/devtools/shared/gcli/commands/cmd.js b/devtools/shared/gcli/commands/cmd.js
index 1777ed96041c..eda181e46129 100644
--- a/devtools/shared/gcli/commands/cmd.js
+++ b/devtools/shared/gcli/commands/cmd.js
@@ -5,18 +5,19 @@
 "use strict";
 
 const { Cc, Ci, Cu } = require("chrome");
+const { OS, TextDecoder } = Cu.import("resource://gre/modules/osfile.jsm", {});
+const { Task } = require("devtools/shared/task");
 
-const { OS } = Cu.import("resource://gre/modules/osfile.jsm", {});
-const { TextEncoder, TextDecoder } = Cu.import('resource://gre/modules/commonjs/toolkit/loader.js', {});
 const gcli = require("gcli/index");
 const l10n = require("gcli/l10n");
 
-loader.lazyGetter(this, "prefBranch", function() {
-  let prefService = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService);
+loader.lazyGetter(this, "prefBranch", function () {
+  let prefService = Cc["@mozilla.org/preferences-service;1"]
+                      .getService(Ci.nsIPrefService);
   return prefService.getBranch(null).QueryInterface(Ci.nsIPrefBranch2);
 });
 
-loader.lazyGetter(this, "supportsString", function() {
+loader.lazyGetter(this, "supportsString", function () {
   return Cc["@mozilla.org/supports-string;1"].createInstance(Ci.nsISupportsString);
 });
 
@@ -66,30 +67,32 @@ function loadItemsFromMozDir() {
 
   // We need to return (a promise of) an array of items from the *.mozcmd
   // files in dirName (which we can assume to be a valid directory now)
-  return statPromise.then(() => {
+  return Task.async(function* () {
+    yield statPromise;
     let itemPromises = [];
 
     let iterator = new OS.File.DirectoryIterator(dirName);
-    let iterPromise = iterator.forEach(entry => {
-      if (entry.name.match(/.*\.mozcmd$/) && !entry.isDir) {
-        itemPromises.push(loadCommandFile(entry));
-      }
-    });
-
-    return iterPromise.then(() => {
-      iterator.close();
-      return Promise.all(itemPromises).then((itemsArray) => {
-        return itemsArray.reduce((prev, curr) => {
-          return prev.concat(curr);
-        }, []);
+    try {
+      yield iterator.forEach(entry => {
+        if (entry.name.match(/.*\.mozcmd$/) && !entry.isDir) {
+          itemPromises.push(loadCommandFile(entry));
+        }
       });
-    }, reason => { iterator.close(); throw reason; });
+      iterator.close();
+      let itemsArray = yield Promise.all(itemPromises);
+      return itemsArray.reduce((prev, curr) => {
+        return prev.concat(curr);
+      }, []);
+    } catch (e) {
+      iterator.close();
+      throw e;
+    }
   });
 }
 
-exports.mozDirLoader = function(name) {
+exports.mozDirLoader = function (name) {
   return loadItemsFromMozDir().then(items => {
-    return { items: items };
+    return { items };
   });
 };
 
@@ -100,10 +103,10 @@ exports.mozDirLoader = function(name) {
  */
 function loadCommandFile(entry) {
   let readPromise = OS.File.read(entry.path);
-  return readPromise = readPromise.then(array => {
+  readPromise = readPromise.then(array => {
     let decoder = new TextDecoder();
     let source = decoder.decode(array);
-    var principal = Cc["@mozilla.org/systemprincipal;1"]
+    let principal = Cc["@mozilla.org/systemprincipal;1"]
                       .createInstance(Ci.nsIPrincipal);
 
     let sandbox = new Cu.Sandbox(principal, {
@@ -113,11 +116,12 @@ function loadCommandFile(entry) {
 
     if (!Array.isArray(data)) {
       console.error("Command file '" + entry.name + "' does not have top level array.");
-      return;
+      return null;
     }
 
     return data;
   });
+  return readPromise;
 }
 
 exports.items = [
@@ -136,7 +140,7 @@ exports.items = [
     get hidden() {
       return !prefBranch.prefHasUserValue(PREF_DIR);
     },
-    exec: function(args, context) {
+    exec: function (args, context) {
       gcli.load();
 
       let dirName = prefBranch.getComplexValue(PREF_DIR,
@@ -164,9 +168,10 @@ exports.items = [
     ],
     returnType: "string",
     get hidden() {
-      return true; // !prefBranch.prefHasUserValue(PREF_DIR);
+      // !prefBranch.prefHasUserValue(PREF_DIR);
+      return true;
     },
-    exec: function(args, context) {
+    exec: function (args, context) {
       supportsString.data = args.directory;
       prefBranch.setComplexValue(PREF_DIR, Ci.nsISupportsString, supportsString);
 
diff --git a/devtools/shared/gcli/commands/cookie.js b/devtools/shared/gcli/commands/cookie.js
index f1680042f6ca..b7b4c655d275 100644
--- a/devtools/shared/gcli/commands/cookie.js
+++ b/devtools/shared/gcli/commands/cookie.js
@@ -24,7 +24,7 @@ const { Ci, Cc } = require("chrome");
 const l10n = require("gcli/l10n");
 const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
 
-XPCOMUtils.defineLazyGetter(this, "cookieMgr", function() {
+XPCOMUtils.defineLazyGetter(this, "cookieMgr", function () {
   return Cc["@mozilla.org/cookiemanager;1"].getService(Ci.nsICookieManager2);
 });
 
@@ -52,9 +52,9 @@ function translateExpires(expires) {
     return l10n.lookup("cookieListOutSession");
   }
 
-  let expires_msec = expires * 1000;
+  let expiresMsec = expires * 1000;
 
-  return (new Date(expires_msec)).toLocaleString();
+  return (new Date(expiresMsec)).toLocaleString();
 }
 
 /**
@@ -86,17 +86,16 @@ exports.items = [
     description: l10n.lookup("cookieListDesc"),
     manual: l10n.lookup("cookieListManual"),
     returnType: "cookies",
-    exec: function(args, context) {
+    exec: function (args, context) {
       if (context.environment.target.isRemote) {
         throw new Error("The cookie gcli commands only work in a local tab, " +
                         "see bug 1221488");
       }
       let host = new URL(context.environment.target.url).host;
-      let contentWindow  = context.environment.window;
+      let contentWindow = context.environment.window;
       host = sanitizeHost(host);
-      let enm = cookieMgr.getCookiesFromHost(host, contentWindow.document.
-                                                   nodePrincipal.
-                                                   originAttributes);
+      let { originAttributes } = contentWindow.document.nodePrincipal;
+      let enm = cookieMgr.getCookiesFromHost(host, originAttributes);
 
       let cookies = [];
       while (enm.hasMoreElements()) {
@@ -131,17 +130,16 @@ exports.items = [
         description: l10n.lookup("cookieRemoveKeyDesc"),
       }
     ],
-    exec: function(args, context) {
+    exec: function (args, context) {
       if (context.environment.target.isRemote) {
         throw new Error("The cookie gcli commands only work in a local tab, " +
                         "see bug 1221488");
       }
       let host = new URL(context.environment.target.url).host;
-      let contentWindow  = context.environment.window;
+      let contentWindow = context.environment.window;
       host = sanitizeHost(host);
-      let enm = cookieMgr.getCookiesFromHost(host, contentWindow.document.
-                                                   nodePrincipal.
-                                                   originAttributes);
+      let { originAttributes } = contentWindow.document.nodePrincipal;
+      let enm = cookieMgr.getCookiesFromHost(host, originAttributes);
 
       while (enm.hasMoreElements()) {
         let cookie = enm.getNext().QueryInterface(Ci.nsICookie);
@@ -158,7 +156,7 @@ exports.items = [
     item: "converter",
     from: "cookies",
     to: "view",
-    exec: function(cookies, context) {
+    exec: function (cookies, context) {
       if (cookies.length == 0) {
         let host = new URL(context.environment.target.url).host;
         host = sanitizeHost(host);
@@ -275,7 +273,7 @@ exports.items = [
         ]
       }
     ],
-    exec: function(args, context) {
+    exec: function (args, context) {
       if (context.environment.target.isRemote) {
         throw new Error("The cookie gcli commands only work in a local tab, " +
                         "see bug 1221488");
@@ -283,7 +281,7 @@ exports.items = [
       let host = new URL(context.environment.target.url).host;
       host = sanitizeHost(host);
       let time = Date.parse(args.expires) / 1000;
-      let contentWindow  = context.environment.window;
+      let contentWindow = context.environment.window;
       cookieMgr.add(args.domain ? "." + args.domain : host,
                     args.path ? args.path : "/",
                     args.name,
@@ -292,9 +290,7 @@ exports.items = [
                     args.httpOnly,
                     args.session,
                     time,
-                    contentWindow.document.
-                                  nodePrincipal.
-                                  originAttributes);
+                    contentWindow.document.nodePrincipal.originAttributes);
     }
   }
 ];
diff --git a/devtools/shared/gcli/commands/csscoverage.js b/devtools/shared/gcli/commands/csscoverage.js
index ebbf0baca83e..0922ff5f6bcc 100644
--- a/devtools/shared/gcli/commands/csscoverage.js
+++ b/devtools/shared/gcli/commands/csscoverage.js
@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Cc, Ci } = require("chrome");
-
 const domtemplate = require("gcli/util/domtemplate");
 const csscoverage = require("devtools/shared/fronts/csscoverage");
 const l10n = csscoverage.l10n;
@@ -37,7 +35,7 @@ exports.items = [
         manual: l10n.lookup("csscoverageStartNoReloadManual")
       }
     ],
-    exec: function*(args, context) {
+    exec: function* (args, context) {
       let usage = yield csscoverage.getUsage(context.environment.target);
       if (usage == null) {
         throw new Error(l10n.lookup("csscoverageNoRemoteError"));
@@ -52,7 +50,7 @@ exports.items = [
     name: "csscoverage stop",
     hidden: true,
     description: l10n.lookup("csscoverageStopDesc2"),
-    exec: function*(args, context) {
+    exec: function* (args, context) {
       let target = context.environment.target;
       let usage = yield csscoverage.getUsage(target);
       if (usage == null) {
@@ -68,7 +66,7 @@ exports.items = [
     name: "csscoverage oneshot",
     hidden: true,
     description: l10n.lookup("csscoverageOneShotDesc2"),
-    exec: function*(args, context) {
+    exec: function* (args, context) {
       let target = context.environment.target;
       let usage = yield csscoverage.getUsage(target);
       if (usage == null) {
@@ -85,25 +83,27 @@ exports.items = [
     hidden: true,
     description: l10n.lookup("csscoverageToggleDesc2"),
     state: {
-      isChecked: function(target) {
+      isChecked: function (target) {
         return csscoverage.getUsage(target).then(usage => {
           return usage.isRunning();
         });
       },
-      onChange: function(target, handler) {
+      onChange: function (target, handler) {
         csscoverage.getUsage(target).then(usage => {
-          this.handler = ev => { handler("state-change", ev); };
+          this.handler = ev => {
+            handler("state-change", ev);
+          };
           usage.on("state-change", this.handler);
         });
       },
-      offChange: function(target, handler) {
+      offChange: function (target, handler) {
         csscoverage.getUsage(target).then(usage => {
           usage.off("state-change", this.handler);
           this.handler = undefined;
         });
       },
     },
-    exec: function*(args, context) {
+    exec: function* (args, context) {
       let target = context.environment.target;
       let usage = yield csscoverage.getUsage(target);
       if (usage == null) {
@@ -120,7 +120,7 @@ exports.items = [
     name: "csscoverage report",
     hidden: true,
     description: l10n.lookup("csscoverageReportDesc2"),
-    exec: function*(args, context) {
+    exec: function* (args, context) {
       let usage = yield csscoverage.getUsage(context.environment.target);
       if (usage == null) {
         throw new Error(l10n.lookup("csscoverageNoRemoteError"));
@@ -137,7 +137,7 @@ exports.items = [
     item: "converter",
     from: "csscoveragePageReport",
     to: "dom",
-    exec: function*(csscoveragePageReport, context) {
+    exec: function* (csscoveragePageReport, context) {
       let target = context.environment.target;
 
       let toolbox = yield gDevTools.showToolbox(target, "styleeditor");
@@ -185,7 +185,8 @@ exports.items = [
       // Create a new chart.
       let container = host.querySelector(".csscoverage-report-chart");
       let chart = Chart.PieTable(panel._panelDoc, {
-        diameter: 200, // px
+        // px
+        diameter: 200,
         title: "CSS Usage",
         data: [
           { size: data.summary.preload, label: "Used Preload" },
diff --git a/devtools/shared/gcli/commands/folder.js b/devtools/shared/gcli/commands/folder.js
index 22a51420d624..2eb4ece83bdb 100644
--- a/devtools/shared/gcli/commands/folder.js
+++ b/devtools/shared/gcli/commands/folder.js
@@ -4,25 +4,24 @@
 
 "use strict";
 
-const { Cc, Ci, Cu, CC } = require("chrome");
+const { Cc, Ci, CC } = require("chrome");
 const Services = require("Services");
 const l10n = require("gcli/l10n");
 const dirService = Cc["@mozilla.org/file/directory_service;1"]
                       .getService(Ci.nsIProperties);
 
-function showFolder(aPath) {
-  let nsLocalFile = CC("@mozilla.org/file/local;1", "nsILocalFile",
+function showFolder(path) {
+  let NSLocalFile = CC("@mozilla.org/file/local;1", "nsILocalFile",
                         "initWithPath");
 
   try {
-    let file = new nsLocalFile(aPath);
+    let file = new NSLocalFile(path);
 
     if (file.exists()) {
       file.reveal();
-      return l10n.lookupFormat("folderOpenDirResult", [aPath]);
-    } else {
-      return l10n.lookup("folderInvalidPath");
+      return l10n.lookupFormat("folderOpenDirResult", [path]);
     }
+    return l10n.lookup("folderInvalidPath");
   } catch (e) {
     return l10n.lookup("folderInvalidPath");
   }
@@ -47,7 +46,7 @@ exports.items = [
       }
     ],
     returnType: "string",
-    exec: function(args, context) {
+    exec: function (args, context) {
       let dirName = args.path;
 
       // replaces ~ with the home directory path in unix and windows
@@ -67,7 +66,7 @@ exports.items = [
     name: "folder openprofile",
     description: l10n.lookup("folderOpenProfileDesc"),
     returnType: "string",
-    exec: function(args, context) {
+    exec: function (args, context) {
       // Get the profile directory.
       let currProfD = Services.dirsvc.get("ProfD", Ci.nsIFile);
       let profileDir = currProfD.path;
diff --git a/devtools/shared/gcli/commands/highlight.js b/devtools/shared/gcli/commands/highlight.js
index cc2353b3bff7..14bcf607802d 100644
--- a/devtools/shared/gcli/commands/highlight.js
+++ b/devtools/shared/gcli/commands/highlight.js
@@ -103,7 +103,7 @@ exports.items = [
         ]
       }
     ],
-    exec: function(args, context) {
+    exec: function (args, context) {
       // Remove all existing highlighters unless told otherwise
       if (!args.keep) {
         unhighlightAll();
diff --git a/devtools/shared/gcli/commands/index.js b/devtools/shared/gcli/commands/index.js
index 8fe77482e405..61058fc642b6 100644
--- a/devtools/shared/gcli/commands/index.js
+++ b/devtools/shared/gcli/commands/index.js
@@ -107,7 +107,7 @@ try {
 /**
  * Add modules to a system for use in a content process (but don't call load)
  */
-exports.addAllItemsByModule = function(system) {
+exports.addAllItemsByModule = function (system) {
   system.addItemsByModule(exports.baseModules, { delayedLoad: true });
   system.addItemsByModule(exports.devtoolsModules, { delayedLoad: true });
   system.addItemsByModule(exports.devtoolsToolModules, { delayedLoad: true });
@@ -133,7 +133,7 @@ var customProperties = [ "buttonId", "buttonClass", "tooltipText" ];
  * Create a system which connects to a GCLI in a remote target
  * @return Promise<System> for the given target
  */
-exports.getSystem = function(target) {
+exports.getSystem = function (target) {
   const existingLinks = linksForTarget.get(target);
   if (existingLinks != null) {
     existingLinks.refs++;
@@ -164,7 +164,7 @@ exports.getSystem = function(target) {
  * Someone that called getSystem doesn't need it any more, so decrement the
  * count of users of the system for that target, and destroy if needed
  */
-exports.releaseSystem = function(target) {
+exports.releaseSystem = function (target) {
   const links = linksForTarget.get(target);
   if (links == null) {
     throw new Error("releaseSystem called for unknown target");
diff --git a/devtools/shared/gcli/commands/inject.js b/devtools/shared/gcli/commands/inject.js
index 85e995eed43b..4f0bfda9fcde 100644
--- a/devtools/shared/gcli/commands/inject.js
+++ b/devtools/shared/gcli/commands/inject.js
@@ -53,7 +53,7 @@ exports.items = [
       },
       description: l10n.lookup("injectLibraryDesc")
     }],
-    exec: function*(args, context) {
+    exec: function* (args, context) {
       let document = context.environment.document;
       let library = args.library;
       let name = (library.type === "selection") ?
@@ -68,7 +68,7 @@ exports.items = [
       try {
         // Check if URI is valid
         Services.io.newURI(src, null, null);
-      } catch(e) {
+      } catch (e) {
         return l10n.lookupFormat("injectFailed", [name]);
       }
 
diff --git a/devtools/shared/gcli/commands/jsb.js b/devtools/shared/gcli/commands/jsb.js
index b56e079d2cee..30ada3802958 100644
--- a/devtools/shared/gcli/commands/jsb.js
+++ b/devtools/shared/gcli/commands/jsb.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-const { Cc, Ci, Cu } = require("chrome");
+const { Cc } = require("chrome");
 const l10n = require("gcli/l10n");
 const XMLHttpRequest = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"];
 
@@ -19,7 +19,7 @@ exports.items = [
     runAt: "client",
     name: "jsb",
     description: l10n.lookup("jsbDesc"),
-    returnValue:"string",
+    returnValue: "string",
     params: [
       {
         name: "url",
@@ -91,7 +91,8 @@ exports.items = [
         ]
       }
     ],
-    exec: function(args, context) {
+    exec: function (args, context) {
+      /* eslint-disable camelcase */
       let opts = {
         indent_size: args.indentSize,
         indent_char: args.indentChar,
@@ -103,12 +104,12 @@ exports.items = [
         space_before_conditional: !args.noSpaceBeforeConditional,
         unescape_strings: args.unescapeStrings
       };
-
+      /* eslint-enable camelcase */
       let xhr = new XMLHttpRequest();
 
       let deferred = context.defer();
 
-      xhr.onreadystatechange = function() {
+      xhr.onreadystatechange = function () {
         if (xhr.readyState == 4) {
           if (xhr.status == 200 || xhr.status == 0) {
             let result = beautify.js(xhr.responseText, opts);
@@ -120,12 +121,12 @@ exports.items = [
             deferred.reject("Unable to load page to beautify: " + args.url + " " +
                             xhr.status + " " + xhr.statusText);
           }
-        };
-      }
+        }
+      };
       try {
         xhr.open("GET", args.url, true);
         xhr.send(null);
-      } catch(e) {
+      } catch (e) {
         return l10n.lookup("jsbInvalidURL");
       }
       return deferred.promise;
diff --git a/devtools/shared/gcli/commands/listen.js b/devtools/shared/gcli/commands/listen.js
index 7878577fb6f5..1d0efd0b84dc 100644
--- a/devtools/shared/gcli/commands/listen.js
+++ b/devtools/shared/gcli/commands/listen.js
@@ -69,7 +69,7 @@ exports.items = [
       },
     ],
     exec: function (args, context) {
-      var listener = debuggerServer.createListener();
+      let listener = debuggerServer.createListener();
       if (!listener) {
         throw new Error(l10n.lookup("listenDisabledOutput"));
       }
diff --git a/devtools/shared/gcli/commands/mdn.js b/devtools/shared/gcli/commands/mdn.js
index 57e582e402e0..c145cee7a790 100644
--- a/devtools/shared/gcli/commands/mdn.js
+++ b/devtools/shared/gcli/commands/mdn.js
@@ -28,7 +28,7 @@ exports.items = [{
     defaultValue: null,
     description: l10n.lookup("mdnCssProp")
   }],
-  exec: function(args) {
+  exec: function (args) {
     if (!MdnDocsWidget) {
       return null;
     }
@@ -47,7 +47,7 @@ exports.items = [{
   item: "converter",
   from: "cssPropertyOutput",
   to: "dom",
-  exec: function(result, context) {
+  exec: function (result, context) {
     let propertyName = result.property;
 
     let document = context.document;
diff --git a/devtools/shared/gcli/commands/measure.js b/devtools/shared/gcli/commands/measure.js
index 7f6233a95c9f..678f7008ca1b 100644
--- a/devtools/shared/gcli/commands/measure.js
+++ b/devtools/shared/gcli/commands/measure.js
@@ -40,7 +40,7 @@ exports.items = [
       onChange: (target, handler) => eventEmitter.on("changed", handler),
       offChange: (target, handler) => eventEmitter.off("changed", handler)
     },
-    exec: function*(args, context) {
+    exec: function* (args, context) {
       let { target } = context.environment;
 
       // Pipe the call to the server command.
@@ -73,7 +73,7 @@ exports.items = [
     runAt: "server",
     hidden: true,
     returnType: "highlighterVisibility",
-    exec: function(args, context) {
+    exec: function (args, context) {
       let env = context.environment;
       let { document } = env;
       let id = getOuterId(env.window);
@@ -99,8 +99,8 @@ exports.items = [
       // window is refreshed or closed with the measuring tool shown.
       events.once(highlighter, "destroy", () => {
         if (highlighters.has(document)) {
-          let { environment } = highlighters.get(document);
-          environment.destroy();
+          let { environment: toDestroy } = highlighters.get(document);
+          toDestroy.destroy();
           highlighters.delete(document);
         }
       });
diff --git a/devtools/shared/gcli/commands/media.js b/devtools/shared/gcli/commands/media.js
index 908e9eb5e45c..8d3e8bf2102f 100644
--- a/devtools/shared/gcli/commands/media.js
+++ b/devtools/shared/gcli/commands/media.js
@@ -38,7 +38,7 @@ exports.items = [
         }
       }
     ],
-    exec: function(args, context) {
+    exec: function (args, context) {
       let contentViewer = getContentViewer(context);
       contentViewer.emulateMedium(args.type);
     }
@@ -48,7 +48,7 @@ exports.items = [
     runAt: "server",
     name: "media reset",
     description: l10n.lookup("mediaResetDesc"),
-    exec: function(args, context) {
+    exec: function (args, context) {
       let contentViewer = getContentViewer(context);
       contentViewer.stopEmulatingMedium();
     }
diff --git a/devtools/shared/gcli/commands/pagemod.js b/devtools/shared/gcli/commands/pagemod.js
index 184ab1ea35a3..5033a005c6a7 100644
--- a/devtools/shared/gcli/commands/pagemod.js
+++ b/devtools/shared/gcli/commands/pagemod.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-const { Cc, Ci, Cu } = require("chrome");
+const { Cc, Ci } = require("chrome");
 const l10n = require("gcli/l10n");
 
 exports.items = [
@@ -37,7 +37,7 @@ exports.items = [
         name: "selector",
         type: "string",
         description: l10n.lookup("pagemodReplaceSelectorDesc"),
-        defaultValue: "*:not(script):not(style):not(embed):not(object):not(frame):not(iframe):not(frameset)",
+        defaultValue: "*:not(script):not(style):not(embed):not(object):not(frame):not(iframe):not(frameset)", // eslint-disable-line
       },
       {
         name: "root",
@@ -63,10 +63,10 @@ exports.items = [
       },
     ],
     // Make a given string safe to use in a regular expression.
-    escapeRegex: function(aString) {
-      return aString.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+    escapeRegex: function (string) {
+      return string.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
     },
-    exec: function(args, context) {
+    exec: function (args, context) {
       let searchTextNodes = !args.attrOnly;
       let searchAttributes = !args.contentOnly;
       let regexOptions = args.ignoreCase ? "ig" : "g";
@@ -153,7 +153,7 @@ exports.items = [
         description: l10n.lookup("pagemodRemoveElementIfEmptyOnlyDesc"),
       },
     ],
-    exec: function(args, context) {
+    exec: function (args, context) {
       let root = args.root || context.environment.document;
       let elements = Array.prototype.slice.call(root.querySelectorAll(args.search));
 
@@ -207,7 +207,7 @@ exports.items = [
         description: l10n.lookup("pagemodRemoveAttributeIgnoreCaseDesc"),
       },
     ],
-    exec: function(args, context) {
+    exec: function (args, context) {
       let root = args.root || context.environment.document;
       let regexOptions = args.ignoreCase ? "ig" : "g";
       let attributeRegex = new RegExp(args.searchAttributes, regexOptions);
@@ -221,7 +221,7 @@ exports.items = [
           continue;
         }
 
-        var attrs = Array.prototype.slice.call(element.attributes);
+        let attrs = Array.prototype.slice.call(element.attributes);
         for (let y = 0; y < attrs.length; y++) {
           let attr = attrs[y];
           if (attributeRegex.test(attr.name)) {
@@ -255,7 +255,7 @@ exports.items = [
         defaultValue: "window"
       }
     ],
-    exec: function(args, context) {
+    exec: function (args, context) {
       let html = context.environment.document.documentElement.outerHTML;
       if (args.destination === "stdout") {
         return html;
@@ -265,12 +265,12 @@ exports.items = [
         let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"]
                           .getService(Ci.nsIClipboardHelper);
         clipboard.copyString(url);
-        return '';
+        return "";
       }
 
       let url = "data:text/plain;charset=utf8," + encodeURIComponent(html);
       context.environment.window.open(url);
-      return '';
+      return "";
     }
   }
 ];
diff --git a/devtools/shared/gcli/commands/paintflashing.js b/devtools/shared/gcli/commands/paintflashing.js
index 7e21911a7ac2..a3df9bdd1cc1 100644
--- a/devtools/shared/gcli/commands/paintflashing.js
+++ b/devtools/shared/gcli/commands/paintflashing.js
@@ -12,7 +12,7 @@ var telemetry;
 try {
   const Telemetry = require("devtools/client/shared/telemetry");
   telemetry = new Telemetry();
-} catch(e) {
+} catch (e) {
   // DevTools Telemetry module only available in Firefox
 }
 
@@ -115,7 +115,7 @@ exports.items = [
         }
       ]
     }],
-    exec: function*(args, context) {
+    exec: function* (args, context) {
       if (!args.chrome) {
         const output = yield context.updateExec("paintflashing_server --state on");
 
@@ -144,7 +144,7 @@ exports.items = [
         }
       ]
     }],
-    exec: function*(args, context) {
+    exec: function* (args, context) {
       if (!args.chrome) {
         const output = yield context.updateExec("paintflashing_server --state off");
 
@@ -169,7 +169,7 @@ exports.items = [
     tooltipText: l10n.lookup("paintflashingTooltip"),
     description: l10n.lookup("paintflashingToggleDesc"),
     manual: l10n.lookup("paintflashingManual"),
-    exec: function*(args, context) {
+    exec: function* (args, context) {
       const output = yield context.updateExec("paintflashing_server --state toggle");
 
       onPaintFlashingChanged(context.environment.target, output.data);
@@ -190,7 +190,7 @@ exports.items = [
       },
     ],
     returnType: "paintFlashingState",
-    exec: function(args, context) {
+    exec: function (args, context) {
       let { window } = context.environment;
       let id = getOuterId(window);
       let flashing = setPaintFlashing(window, args.state);
diff --git a/devtools/shared/gcli/commands/qsa.js b/devtools/shared/gcli/commands/qsa.js
index 939991f18c27..0e25a07aa4c2 100644
--- a/devtools/shared/gcli/commands/qsa.js
+++ b/devtools/shared/gcli/commands/qsa.js
@@ -1,24 +1,24 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const l10n = require("gcli/l10n");
-
-exports.items = [
-  {
-    item: "command",
-    runAt: "server",
-    name: "qsa",
-    description: l10n.lookup("qsaDesc"),
-    params: [{
-      name: "query",
-      type: "nodelist",
-      description: l10n.lookup("qsaQueryDesc")
-    }],
-    exec: function(args, context) {
-      return args.query.length;
-    }
-  }
-];
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const l10n = require("gcli/l10n");
+
+exports.items = [
+  {
+    item: "command",
+    runAt: "server",
+    name: "qsa",
+    description: l10n.lookup("qsaDesc"),
+    params: [{
+      name: "query",
+      type: "nodelist",
+      description: l10n.lookup("qsaQueryDesc")
+    }],
+    exec: function (args, context) {
+      return args.query.length;
+    }
+  }
+];
diff --git a/devtools/shared/gcli/commands/restart.js b/devtools/shared/gcli/commands/restart.js
index cf0e688d3cb6..41362490eed9 100644
--- a/devtools/shared/gcli/commands/restart.js
+++ b/devtools/shared/gcli/commands/restart.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-const { Cc, Ci, Cu } = require("chrome");
+const { Cc, Ci } = require("chrome");
 const l10n = require("gcli/l10n");
 const Services = require("Services");
 
diff --git a/devtools/shared/gcli/commands/rulers.js b/devtools/shared/gcli/commands/rulers.js
index 121e975bcba5..f5a230d62002 100644
--- a/devtools/shared/gcli/commands/rulers.js
+++ b/devtools/shared/gcli/commands/rulers.js
@@ -39,7 +39,7 @@ exports.items = [
       onChange: (target, handler) => eventEmitter.on("changed", handler),
       offChange: (target, handler) => eventEmitter.off("changed", handler)
     },
-    exec: function*(args, context) {
+    exec: function* (args, context) {
       let { target } = context.environment;
 
       // Pipe the call to the server command.
@@ -71,7 +71,7 @@ exports.items = [
     runAt: "server",
     hidden: true,
     returnType: "highlighterVisibility",
-    exec: function(args, context) {
+    exec: function (args, context) {
       let env = context.environment;
       let { document } = env;
       let id = getOuterId(env.window);
@@ -97,8 +97,8 @@ exports.items = [
       // window is refreshed or closed with the rulers shown.
       events.once(highlighter, "destroy", () => {
         if (highlighters.has(document)) {
-          let { environment } = highlighters.get(document);
-          environment.destroy();
+          let { environment: toDestroy } = highlighters.get(document);
+          toDestroy.destroy();
           highlighters.delete(document);
         }
       });
diff --git a/devtools/shared/gcli/commands/screenshot.js b/devtools/shared/gcli/commands/screenshot.js
index d4e474785822..de969acc6f45 100644
--- a/devtools/shared/gcli/commands/screenshot.js
+++ b/devtools/shared/gcli/commands/screenshot.js
@@ -9,7 +9,6 @@ const l10n = require("gcli/l10n");
 const Services = require("Services");
 const { NetUtil } = require("resource://gre/modules/NetUtil.jsm");
 const { getRect } = require("devtools/shared/layout/utils");
-const promise = require("promise");
 const defer = require("devtools/shared/defer");
 const { Task } = require("devtools/shared/task");
 
@@ -19,11 +18,6 @@ loader.lazyImporter(this, "FileUtils", "resource://gre/modules/FileUtils.jsm");
 loader.lazyImporter(this, "PrivateBrowsingUtils",
                           "resource://gre/modules/PrivateBrowsingUtils.jsm");
 
-const BRAND_SHORT_NAME = Cc["@mozilla.org/intl/stringbundle;1"]
-                           .getService(Ci.nsIStringBundleService)
-                           .createBundle("chrome://branding/locale/brand.properties")
-                           .GetStringFromName("brandShortName");
-
 // String used as an indication to generate default file name in the following
 // format: "Screen Shot yyyy-mm-dd at HH.MM.SS.png"
 const FILENAME_DEFAULT_VALUE = " ";
@@ -128,7 +122,7 @@ exports.items = [
     item: "converter",
     from: "imageSummary",
     to: "dom",
-    exec: function(imageSummary, context) {
+    exec: function (imageSummary, context) {
       const document = context.document;
       const root = document.createElement("div");
 
@@ -142,7 +136,8 @@ exports.items = [
       // Add the thumbnail image
       if (imageSummary.data != null) {
         const image = context.document.createElement("div");
-        const previewHeight = parseInt(256 * imageSummary.height / imageSummary.width);
+        const previewHeight = parseInt(256 * imageSummary.height / imageSummary.width,
+                                       10);
         const style = "" +
             "width: 256px;" +
             "height: " + previewHeight + "px;" +
@@ -240,9 +235,7 @@ function captureScreenshot(args, document) {
       }, args.delay * 1000);
     });
   }
-  else {
-    return createScreenshotData(document, args);
-  }
+  return createScreenshotData(document, args);
 }
 
 /**
@@ -260,8 +253,8 @@ function saveScreenshot(args, context, reply) {
 
   return Promise.all([
     args.clipboard ? saveToClipboard(context, reply) : SKIP,
-    args.imgur     ? uploadToImgur(reply)            : SKIP,
-    fileNeeded     ? saveToFile(context, reply)      : SKIP,
+    args.imgur ? uploadToImgur(reply) : SKIP,
+    fileNeeded ? saveToFile(context, reply) : SKIP,
   ]).then(() => reply);
 }
 
@@ -283,15 +276,13 @@ function createScreenshotData(document, args) {
   if (args.fullpage) {
     // Bug 961832: GCLI screenshot shows fixed position element in wrong
     // position if we don't scroll to top
-    window.scrollTo(0,0);
+    window.scrollTo(0, 0);
     width = window.innerWidth + window.scrollMaxX - window.scrollMinX;
     height = window.innerHeight + window.scrollMaxY - window.scrollMinY;
     filename = filename.replace(".png", "-fullpage.png");
-  }
-  else if (args.selector) {
+  } else if (args.selector) {
     ({ top, left, width, height } = getRect(window, args.selector, window));
-  }
-  else {
+  } else {
     left = window.scrollX;
     top = window.scrollY;
     width = window.innerWidth;
@@ -347,7 +338,7 @@ function getFilename(defaultName) {
   const date = new Date();
   let dateString = date.getFullYear() + "-" + (date.getMonth() + 1) +
                   "-" + date.getDate();
-  dateString = dateString.split("-").map(function(part) {
+  dateString = dateString.split("-").map(function (part) {
     if (part.length == 1) {
       part = "0" + part;
     }
@@ -399,8 +390,7 @@ function saveToClipboard(context, reply) {
     clip.setData(trans, null, Ci.nsIClipboard.kGlobalClipboard);
 
     reply.destinations.push(l10n.lookup("screenshotCopied"));
-  }
-  catch (ex) {
+  } catch (ex) {
     console.error(ex);
     reply.destinations.push(l10n.lookup("screenshotErrorCopying"));
   }
@@ -422,14 +412,15 @@ function uploadToImgur(reply) {
     fd.append("title", reply.filename);
 
     const postURL = Services.prefs.getCharPref("devtools.gcli.imgurUploadURL");
-    const clientID = "Client-ID " + Services.prefs.getCharPref("devtools.gcli.imgurClientID");
+    const clientID = "Client-ID " +
+                     Services.prefs.getCharPref("devtools.gcli.imgurClientID");
 
     xhr.open("POST", postURL);
     xhr.setRequestHeader("Authorization", clientID);
     xhr.send(fd);
     xhr.responseType = "json";
 
-    xhr.onreadystatechange = function() {
+    xhr.onreadystatechange = function () {
       if (xhr.readyState == 4) {
         if (xhr.status == 200) {
           reply.href = xhr.response.data.link;
@@ -477,7 +468,7 @@ function DownloadListener(win, transfer) {
 }
 
 DownloadListener.prototype = {
-  QueryInterface: function(iid) {
+  QueryInterface: function (iid) {
     if (iid.equals(Ci.nsIInterfaceRequestor) ||
         iid.equals(Ci.nsIWebProgressListener) ||
         iid.equals(Ci.nsIWebProgressListener2) ||
@@ -487,7 +478,7 @@ DownloadListener.prototype = {
     throw Cr.NS_ERROR_NO_INTERFACE;
   },
 
-  getInterface: function(iid) {
+  getInterface: function (iid) {
     if (iid.equals(Ci.nsIAuthPrompt) ||
         iid.equals(Ci.nsIAuthPrompt2)) {
       let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"]
@@ -498,7 +489,7 @@ DownloadListener.prototype = {
     throw Cr.NS_ERROR_NO_INTERFACE;
   },
 
-  onStateChange: function(webProgress, request, state, status) {
+  onStateChange: function (webProgress, request, state, status) {
     // Check if the download has completed
     if ((state & Ci.nsIWebProgressListener.STATE_STOP) &&
         (state & Ci.nsIWebProgressListener.STATE_IS_NETWORK)) {
@@ -517,7 +508,7 @@ DownloadListener.prototype = {
  * Save the screenshot data to disk, returning a promise which is resolved on
  * completion.
  */
-var saveToFile = Task.async(function*(context, reply) {
+var saveToFile = Task.async(function* (context, reply) {
   let document = context.environment.chromeDocument;
   let window = context.environment.chromeWindow;
 
diff --git a/devtools/shared/gcli/commands/security.js b/devtools/shared/gcli/commands/security.js
index eeed03c61c95..4730211e3aaa 100644
--- a/devtools/shared/gcli/commands/security.js
+++ b/devtools/shared/gcli/commands/security.js
@@ -13,17 +13,15 @@
 
 "use strict";
 
-const { Cc, Ci, Cu, CC } = require("chrome");
+const { Ci } = require("chrome");
 const l10n = require("gcli/l10n");
-const CSP = Cc["@mozilla.org/cspcontext;1"].getService(Ci.nsIContentSecurityPolicy);
 
 const GOOD_IMG_SRC = "chrome://browser/content/gcli_sec_good.svg";
 const MOD_IMG_SRC = "chrome://browser/content/gcli_sec_moderate.svg";
 const BAD_IMG_SRC = "chrome://browser/content/gcli_sec_bad.svg";
 
-
 // special handling within policy
-const POLICY_REPORT_ONLY = "report-only"
+const POLICY_REPORT_ONLY = "report-only";
 
 // special handling of directives
 const DIR_UPGRADE_INSECURE = "upgrade-insecure-requests";
@@ -42,7 +40,11 @@ const CONTENT_SECURITY_POLICY_REPORT_ONLY_MSG = l10n.lookup("securityCSPROHeader
 const NEXT_URI_HEADER = l10n.lookup("securityReferrerNextURI");
 const CALCULATED_REFERRER_HEADER = l10n.lookup("securityReferrerCalculatedReferrer");
 /* The official names from the W3C Referrer Policy Draft http://www.w3.org/TR/referrer-policy/ */
-const REFERRER_POLICY_NAMES = [ "None When Downgrade (default)", "None", "Origin Only", "Origin When Cross-Origin", "Unsafe URL" ];
+const REFERRER_POLICY_NAMES = [
+  "None When Downgrade (default)",
+  "None", "Origin Only",
+  "Origin When Cross-Origin", "Unsafe URL"
+];
 
 exports.items = [
   {
@@ -59,24 +61,23 @@ exports.items = [
     description: l10n.lookup("securityCSPDesc"),
     manual: l10n.lookup("securityCSPManual"),
     returnType: "securityCSPInfo",
-    exec: function(args, context) {
+    exec: function (args, context) {
+      let cspJSON = context.environment.document.nodePrincipal.cspJSON;
+      let cspOBJ = JSON.parse(cspJSON);
 
-      var cspJSON = context.environment.document.nodePrincipal.cspJSON;
-      var cspOBJ = JSON.parse(cspJSON);
+      let outPolicies = [];
 
-      var outPolicies = [];
-
-      var policies = cspOBJ["csp-policies"];
+      let policies = cspOBJ["csp-policies"];
 
       // loop over all the different policies
-      for (var csp in policies) {
-        var curPolicy = policies[csp];
+      for (let csp in policies) {
+        let curPolicy = policies[csp];
 
         // loop over all the directive-values within that policy
-        var outDirectives = [];
-        var outHeader = CONTENT_SECURITY_POLICY_MSG;
-        for (var dir in curPolicy) {
-          var curDir = curPolicy[dir];
+        let outDirectives = [];
+        let outHeader = CONTENT_SECURITY_POLICY_MSG;
+        for (let dir in curPolicy) {
+          let curDir = curPolicy[dir];
 
           // when iterating properties within the obj we might also
           // encounter the 'report-only' flag, which is not a csp directive.
@@ -88,7 +89,7 @@ exports.items = [
           }
 
           // loop over all the directive-sources within that directive
-          var outSrcs = [];
+          let outSrcs = [];
 
           // special case handling for the directives
           // upgrade-insecure-requests and block-all-mixed-content
@@ -97,17 +98,19 @@ exports.items = [
               dir === DIR_BLOCK_ALL_MIXED_CONTENT) {
             outSrcs.push({
               icon: GOOD_IMG_SRC,
-              src: "", // no src
-              desc: "" // no description
+              // no src
+              src: "",
+              // no description
+              desc: ""
             });
           }
 
-          for (var src in curDir) {
-            var curSrc = curDir[src];
+          for (let src in curDir) {
+            let curSrc = curDir[src];
 
             // the default icon and descritpion of the directive-src
-            var outIcon = GOOD_IMG_SRC;
-            var outDesc = "";
+            let outIcon = GOOD_IMG_SRC;
+            let outDesc = "";
 
             if (curSrc.indexOf("*") > -1) {
               outIcon = MOD_IMG_SRC;
@@ -142,8 +145,8 @@ exports.items = [
     item: "converter",
     from: "securityCSPInfo",
     to: "view",
-    exec: function(cspInfo, context) {
-      var url = context.environment.target.url;
+    exec: function (cspInfo, context) {
+      const url = context.environment.target.url;
 
       if (cspInfo.length == 0) {
         return context.createView({
@@ -156,6 +159,7 @@ exports.items = [
             "</table>"});
       }
 
+      /* eslint-disable max-len */
       return context.createView({
         html:
           "<table class='gcli-csp-detail' cellspacing='10' valign='top'>" +
@@ -181,10 +185,11 @@ exports.items = [
           "    </td>" +
           "  </tr>" +
           "</table>",
-          data: {
-            cspinfo: cspInfo,
-          }
-        });
+        data: {
+          cspinfo: cspInfo,
+        }
+      });
+      /* eslint-enable max-len */
     }
   },
   {
@@ -195,17 +200,17 @@ exports.items = [
     description: l10n.lookup("securityReferrerPolicyDesc"),
     manual: l10n.lookup("securityReferrerPolicyManual"),
     returnType: "securityReferrerPolicyInfo",
-    exec: function(args, context) {
-      var doc = context.environment.document;
+    exec: function (args, context) {
+      let doc = context.environment.document;
 
-      var referrerPolicy = doc.referrerPolicy;
+      let { referrerPolicy } = doc;
 
-      var pageURI = doc.documentURIObject;
-      var sameDomainReferrer = "";
-      var otherDomainReferrer = "";
-      var downgradeReferrer = "";
-      var otherDowngradeReferrer = "";
-      var origin = pageURI.prePath;
+      let pageURI = doc.documentURIObject;
+      let sameDomainReferrer = "";
+      let otherDomainReferrer = "";
+      let downgradeReferrer = "";
+      let otherDowngradeReferrer = "";
+      let origin = pageURI.prePath;
 
       switch (referrerPolicy) {
         case Ci.nsIHttpChannel.REFERRER_POLICY_NO_REFERRER:
@@ -255,28 +260,28 @@ exports.items = [
           break;
       }
 
-      var sameDomainUri = origin + "/*";
+      let sameDomainUri = origin + "/*";
 
-      var referrerUrls = [
+      let referrerUrls = [
         // add the referrer uri 'referrer' we would send when visiting 'uri'
         {
-          uri: pageURI.scheme+'://example.com/',
+          uri: pageURI.scheme + "://example.com/",
           referrer: otherDomainReferrer,
-          description: l10n.lookup('securityReferrerPolicyOtherDomain')},
+          description: l10n.lookup("securityReferrerPolicyOtherDomain")},
         {
           uri: sameDomainUri,
           referrer: sameDomainReferrer,
-          description: l10n.lookup('securityReferrerPolicySameDomain')}
+          description: l10n.lookup("securityReferrerPolicySameDomain")}
       ];
 
-      if (pageURI.schemeIs('https')) {
+      if (pageURI.schemeIs("https")) {
         // add the referrer we would send on downgrading http->https
         if (sameDomainReferrer != downgradeReferrer) {
           referrerUrls.push({
-            uri: "http://"+pageURI.hostPort+"/*",
+            uri: "http://" + pageURI.hostPort + "/*",
             referrer: downgradeReferrer,
             description:
-              l10n.lookup('securityReferrerPolicySameDomainDowngrade')
+              l10n.lookup("securityReferrerPolicySameDomainDowngrade")
           });
         }
         if (otherDomainReferrer != otherDowngradeReferrer) {
@@ -284,7 +289,7 @@ exports.items = [
             uri: "http://example.com/",
             referrer: otherDowngradeReferrer,
             description:
-              l10n.lookup('securityReferrerPolicyOtherDomainDowngrade')
+              l10n.lookup("securityReferrerPolicyOtherDomainDowngrade")
           });
         }
       }
@@ -294,16 +299,16 @@ exports.items = [
                                   [pageURI.spec]),
         policyName: REFERRER_POLICY_NAMES[referrerPolicy],
         urls: referrerUrls
-      }
+      };
     }
   },
   {
     item: "converter",
     from: "securityReferrerPolicyInfo",
     to: "view",
-    exec: function(referrerPolicyInfo, context) {
+    exec: function (referrerPolicyInfo, context) {
       return context.createView({
-          html:
+        html:
           "<div class='gcli-referrer-policy'>" +
           "  <strong> ${rpi.header} </strong> <br />" +
           "  ${rpi.policyName} <br />" +
@@ -319,10 +324,10 @@ exports.items = [
           "    </tr>" +
           "  </table>" +
           "</div>",
-          data: {
-            rpi: referrerPolicyInfo,
-          }
-        });
-     }
+        data: {
+          rpi: referrerPolicyInfo,
+        }
+      });
+    }
   }
 ];
diff --git a/devtools/shared/transport/packets.js b/devtools/shared/transport/packets.js
index 3ebcd8f133c4..7ae7563b27db 100644
--- a/devtools/shared/transport/packets.js
+++ b/devtools/shared/transport/packets.js
@@ -24,12 +24,11 @@
  *     Called to clean up at the end of use
  */
 
-const { Cc, Ci, Cu } = require("chrome");
+const { Cc, Ci } = require("chrome");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 const { dumpn, dumpv } = DevToolsUtils;
 const flags = require("devtools/shared/flags");
 const StreamUtils = require("devtools/shared/transport/stream-utils");
-const promise = require("promise");
 const defer = require("devtools/shared/defer");
 
 DevToolsUtils.defineLazyGetter(this, "unicodeConverter", () => {
@@ -136,7 +135,9 @@ Object.defineProperty(JSONPacket.prototype, "object", {
   /**
    * Gets the object (not the serialized string) being read or written.
    */
-  get: function () { return this._object; },
+  get: function () {
+    return this._object;
+  },
 
   /**
    * Sets the object to be sent when write() is called.
@@ -200,7 +201,9 @@ JSONPacket.prototype.write = function (stream) {
 };
 
 Object.defineProperty(JSONPacket.prototype, "done", {
-  get: function () { return this._done; }
+  get: function () {
+    return this._done;
+  }
 });
 
 JSONPacket.prototype.toString = function () {
@@ -369,10 +372,11 @@ Object.defineProperty(BulkPacket.prototype, "header", {
 });
 
 Object.defineProperty(BulkPacket.prototype, "done", {
-  get: function () { return this._done; },
+  get: function () {
+    return this._done;
+  },
 });
 
-
 BulkPacket.prototype.toString = function () {
   return "Bulk: " + JSON.stringify(this.header, null, 2);
 };
@@ -408,7 +412,9 @@ RawPacket.prototype.write = function (stream) {
 };
 
 Object.defineProperty(RawPacket.prototype, "done", {
-  get: function () { return this._done; }
+  get: function () {
+    return this._done;
+  }
 });
 
 exports.RawPacket = RawPacket;
diff --git a/devtools/shared/transport/stream-utils.js b/devtools/shared/transport/stream-utils.js
index 23f67a518ada..2600a6b1c286 100644
--- a/devtools/shared/transport/stream-utils.js
+++ b/devtools/shared/transport/stream-utils.js
@@ -4,12 +4,11 @@
 
 "use strict";
 
-const { Ci, Cc, Cu, Cr, CC } = require("chrome");
+const { Ci, Cc, Cr, CC } = require("chrome");
 const Services = require("Services");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 const { dumpv } = DevToolsUtils;
 const EventEmitter = require("devtools/shared/event-emitter");
-const promise = require("promise");
 const defer = require("devtools/shared/defer");
 
 DevToolsUtils.defineLazyGetter(this, "IOUtil", () => {
@@ -70,8 +69,8 @@ function StreamCopier(input, output, length) {
   if (IOUtil.outputStreamIsBuffered(output)) {
     this.output = output;
   } else {
-    this.output = Cc["@mozilla.org/network/buffered-output-stream;1"].
-                  createInstance(Ci.nsIBufferedOutputStream);
+    this.output = Cc["@mozilla.org/network/buffered-output-stream;1"]
+                  .createInstance(Ci.nsIBufferedOutputStream);
     this.output.init(output, BUFFER_SIZE);
   }
   this._length = length;
@@ -124,9 +123,8 @@ StreamCopier.prototype = {
         this._debug("Waiting for output stream");
         this.baseAsyncOutput.asyncWait(this, 0, 0, Services.tm.currentThread);
         return;
-      } else {
-        throw e;
       }
+      throw e;
     }
 
     this._amountLeft -= bytesCopied;
@@ -162,9 +160,8 @@ StreamCopier.prototype = {
         this._debug("Waiting for output stream");
         this.baseAsyncOutput.asyncWait(this, 0, 0, Services.tm.currentThread);
         return;
-      } else {
-        throw e;
       }
+      throw e;
     }
     this._deferred.resolve();
   },
diff --git a/devtools/shared/worker/helper.js b/devtools/shared/worker/helper.js
index 69512550bb31..1e98867402e6 100644
--- a/devtools/shared/worker/helper.js
+++ b/devtools/shared/worker/helper.js
@@ -1,9 +1,12 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-(function (root, factory) {
-  "use strict";
 
+/* eslint-env amd */
+
+"use strict";
+
+(function (root, factory) {
   if (typeof define === "function" && define.amd) {
     define(factory);
   } else if (typeof exports === "object") {
@@ -12,8 +15,6 @@
     root.workerHelper = factory();
   }
 }(this, function () {
-  "use strict";
-
   /**
    * This file is to only be included by ChromeWorkers. This exposes
    * a `createTask` function to workers to register tasks for communication
@@ -81,23 +82,20 @@
       }
 
       try {
-        let results;
         handleResponse(taskFn(data));
-      } catch (e) {
-        handleError(e);
+      } catch (ex) {
+        handleError(ex);
       }
 
       function handleResponse(response) {
         // If a promise
         if (response && typeof response.then === "function") {
           response.then(val => self.postMessage({ id, response: val }), handleError);
-        }
-        // If an error object
-        else if (response instanceof Error) {
+        } else if (response instanceof Error) {
+          // If an error object
           handleError(response);
-        }
-        // If anything else
-        else {
+        } else {
+          // If anything else
           self.postMessage({ id, response });
         }
       }
@@ -106,21 +104,23 @@
         try {
           // First, try and structured clone the error across directly.
           self.postMessage({ id, error });
-        } catch (_) {
+        } catch (x) {
           // We could not clone whatever error value was given. Do our best to
           // stringify it.
           let errorString = `Error while performing task "${task}": `;
 
           try {
             errorString += error.toString();
-          } catch (_) {
+          } catch (ex) {
             errorString += "<could not stringify error>";
           }
 
           if ("stack" in error) {
             try {
               errorString += "\n" + error.stack;
-            } catch (_) { }
+            } catch (err) {
+              // Do nothing
+            }
           }
 
           self.postMessage({ id, error: errorString });
@@ -130,4 +130,4 @@
   }
 
   return { createTask: createTask };
-}.bind(this)));
+}));
diff --git a/devtools/shared/worker/loader.js b/devtools/shared/worker/loader.js
index 3b6264cf18fc..a1728a317fbb 100644
--- a/devtools/shared/worker/loader.js
+++ b/devtools/shared/worker/loader.js
@@ -4,6 +4,8 @@
 
 "use strict";
 
+/* global worker */
+
 // A CommonJS module loader that is designed to run inside a worker debugger.
 // We can't simply use the SDK module loader, because it relies heavily on
 // Components, which isn't available in workers.
@@ -60,7 +62,7 @@ function normalizeId(id) {
   // An id consists of an optional root and a path. A root consists of either
   // a scheme name followed by 2 or 3 slashes, or a single slash. Slashes in the
   // root are not used as separators, so only normalize the path.
-  let [_, root, path] = id.match(/^(\w+:\/\/\/?|\/)?(.*)/);
+  let [, root, path] = id.match(/^(\w+:\/\/\/?|\/)?(.*)/);
 
   let stack = [];
   path.split("/").forEach(function (component) {
@@ -75,12 +77,10 @@ function normalizeId(id) {
           } else {
             stack.push("..");
           }
+        } else if (stack[stack.length - 1] == "..") {
+          stack.push("..");
         } else {
-          if (stack[stack.length - 1] == "..") {
-            stack.push("..");
-          } else {
-            stack.pop();
-          }
+          stack.pop();
         }
         break;
       default:
@@ -336,7 +336,8 @@ var loader = {
     Object.defineProperty(object, name, {
       get: function () {
         delete object[name];
-        return object[name] = lambda.apply(object);
+        object[name] = lambda.apply(object);
+        return object[name];
       },
       configurable: true,
       enumerable: true
@@ -361,6 +362,7 @@ var loader = {
 // object to implement them. On worker threads, we use the APIs provided by
 // the worker debugger.
 
+/* eslint-disable no-shadow */
 var {
   Debugger,
   URL,
@@ -372,13 +374,12 @@ var {
   setImmediate,
   xpcInspector,
 } = (function () {
-  if (typeof Components === "object") { // Main thread
+  // Main thread
+  if (typeof Components === "object") {
     let {
       Constructor: CC,
       classes: Cc,
-      manager: Cm,
       interfaces: Ci,
-      results: Cr,
       utils: Cu
     } = Components;
 
@@ -406,8 +407,8 @@ var {
 
     let rpc = undefined;
 
-    let subScriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
-                 getService(Ci.mozIJSSubScriptLoader);
+    let subScriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
+                 .getService(Ci.mozIJSSubScriptLoader);
 
     let loadSubScript = function (url, sandbox) {
       subScriptLoader.loadSubScript(url, sandbox, "UTF-8");
@@ -421,8 +422,8 @@ var {
       Timer.setTimeout(callback, 0);
     };
 
-    let xpcInspector = Cc["@mozilla.org/jsinspector;1"].
-                       getService(Ci.nsIJSInspector);
+    let xpcInspector = Cc["@mozilla.org/jsinspector;1"]
+                       .getService(Ci.nsIJSInspector);
 
     return {
       Debugger,
@@ -435,46 +436,47 @@ var {
       setImmediate,
       xpcInspector
     };
-  } else { // Worker thread
-    let requestors = [];
-
-    let scope = this;
-
-    let xpcInspector = {
-      get eventLoopNestLevel() {
-        return requestors.length;
-      },
-
-      get lastNestRequestor() {
-        return requestors.length === 0 ? null : requestors[requestors.length - 1];
-      },
-
-      enterNestedEventLoop: function (requestor) {
-        requestors.push(requestor);
-        scope.enterEventLoop();
-        return requestors.length;
-      },
-
-      exitNestedEventLoop: function () {
-        requestors.pop();
-        scope.leaveEventLoop();
-        return requestors.length;
-      }
-    };
-
-    return {
-      Debugger: this.Debugger,
-      URL: this.URL,
-      createSandbox: this.createSandbox,
-      dump: this.dump,
-      rpc: this.rpc,
-      loadSubScript: this.loadSubScript,
-      reportError: this.reportError,
-      setImmediate: this.setImmediate,
-      xpcInspector: xpcInspector
-    };
   }
+  // Worker thread
+  let requestors = [];
+
+  let scope = this;
+
+  let xpcInspector = {
+    get eventLoopNestLevel() {
+      return requestors.length;
+    },
+
+    get lastNestRequestor() {
+      return requestors.length === 0 ? null : requestors[requestors.length - 1];
+    },
+
+    enterNestedEventLoop: function (requestor) {
+      requestors.push(requestor);
+      scope.enterEventLoop();
+      return requestors.length;
+    },
+
+    exitNestedEventLoop: function () {
+      requestors.pop();
+      scope.leaveEventLoop();
+      return requestors.length;
+    }
+  };
+
+  return {
+    Debugger: this.Debugger,
+    URL: this.URL,
+    createSandbox: this.createSandbox,
+    dump: this.dump,
+    rpc: this.rpc,
+    loadSubScript: this.loadSubScript,
+    reportError: this.reportError,
+    setImmediate: this.setImmediate,
+    xpcInspector: xpcInspector
+  };
 }).call(this);
+/* eslint-enable no-shadow */
 
 // Create the default instance of the worker loader, using the APIs we defined
 // above.
diff --git a/devtools/shared/worker/tests/browser/browser_worker-01.js b/devtools/shared/worker/tests/browser/browser_worker-01.js
index 7679e4166303..c12549951a17 100644
--- a/devtools/shared/worker/tests/browser/browser_worker-01.js
+++ b/devtools/shared/worker/tests/browser/browser_worker-01.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 // Tests that the devtools/shared/worker communicates properly
 // as both CommonJS module and as a JSM.
 
@@ -37,7 +39,7 @@ function* testWorker(context, workerFactory) {
   ok(results.plottedData.length,
     `worker should have returned an object with array properties in ${context}`);
 
-  let fn = workerify(function (x) { return x * x; });
+  let fn = workerify(x => x * x);
   is((yield fn(5)), 25, `workerify works in ${context}`);
   fn.destroy();
 
diff --git a/devtools/shared/worker/tests/browser/browser_worker-02.js b/devtools/shared/worker/tests/browser/browser_worker-02.js
index e6a9a54cfd74..3b7503d60230 100644
--- a/devtools/shared/worker/tests/browser/browser_worker-02.js
+++ b/devtools/shared/worker/tests/browser/browser_worker-02.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 // Tests errors are handled properly by the DevToolsWorker.
 
 const { DevToolsWorker } = require("devtools/shared/worker/worker");
@@ -9,7 +11,7 @@ const WORKER_URL =
 
 add_task(function* () {
   try {
-    let workerNotFound = new DevToolsWorker("resource://i/dont/exist.js");
+    new DevToolsWorker("resource://i/dont/exist.js");
     ok(false, "Creating a DevToolsWorker with an invalid URL throws");
   } catch (e) {
     ok(true, "Creating a DevToolsWorker with an invalid URL throws");
@@ -19,14 +21,16 @@ add_task(function* () {
   try {
     // plotTimestampsGraph requires timestamp, interval an duration props on the object
     // passed in so there should be an error thrown in the worker
-    let results = yield worker.performTask("plotTimestampsGraph", {});
-    ok(false, "DevToolsWorker returns a rejected promise when an error occurs in the worker");
+    yield worker.performTask("plotTimestampsGraph", {});
+    ok(false,
+       "DevToolsWorker returns a rejected promise when an error occurs in the worker");
   } catch (e) {
-    ok(true, "DevToolsWorker returns a rejected promise when an error occurs in the worker");
+    ok(true,
+       "DevToolsWorker returns a rejected promise when an error occurs in the worker");
   }
 
   try {
-    let results = yield worker.performTask("not a real task");
+    yield worker.performTask("not a real task");
     ok(false, "DevToolsWorker returns a rejected promise when task does not exist");
   } catch (e) {
     ok(true, "DevToolsWorker returns a rejected promise when task does not exist");
@@ -34,7 +38,7 @@ add_task(function* () {
 
   worker.destroy();
   try {
-    let results = yield worker.performTask("plotTimestampsGraph", {
+    yield worker.performTask("plotTimestampsGraph", {
       timestamps: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
       interval: 1,
       duration: 1
diff --git a/devtools/shared/worker/tests/browser/browser_worker-03.js b/devtools/shared/worker/tests/browser/browser_worker-03.js
index 053e381b90c2..93325b686051 100644
--- a/devtools/shared/worker/tests/browser/browser_worker-03.js
+++ b/devtools/shared/worker/tests/browser/browser_worker-03.js
@@ -1,12 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 // Tests that the devtools/shared/worker can handle:
 // returned primitives (or promise or Error)
 //
 // And tests `workerify` by doing so.
 
-const { DevToolsWorker, workerify } = require("devtools/shared/worker/worker");
+const { workerify } = require("devtools/shared/worker/worker");
 function square(x) {
   return x * x;
 }