diff --git a/.eslintignore b/.eslintignore
index e02d302d64f5..61f457a45974 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -116,17 +116,9 @@ devtools/client/storage/test/*.html
 !devtools/client/storage/test/storage-search.html
 !devtools/client/storage/test/storage-unsecured-iframe.html
 !devtools/client/storage/test/storage-unsecured-iframe-usercontextid.html
-devtools/client/webaudioeditor/**
-devtools/client/webconsole/old/net/**
-!devtools/client/webconsole/test/mochitest/**
-devtools/client/webconsole/old/test/**
-devtools/client/webconsole/old/webconsole.js
-devtools/client/webide/**
-!devtools/client/webide/components/webideCli.js
 devtools/server/tests/browser/storage-*.html
 !devtools/server/tests/browser/storage-unsecured-iframe.html
 devtools/server/tests/browser/stylesheets-nested-iframes.html
-devtools/server/tests/unit/xpcshell_debugging_script.js
 devtools/client/shared/webpack/shims/test/test_clipboard.html
 devtools/shared/qrcode/tests/mochitest/test_decode.html
 devtools/shared/tests/mochitest/*.html
@@ -137,6 +129,10 @@ devtools/client/commandline/**
 # Soon to be removed, the new/ directory is explicitly excluded below due to
 # also being an imported repository.
 devtools/client/debugger/**
+# Soon to be removed
+devtools/client/webconsole/old/net/**
+devtools/client/webconsole/old/test/**
+devtools/client/webconsole/old/webconsole.js
 
 # Ignore devtools imported repositories
 devtools/client/debugger/new/**
@@ -144,6 +140,7 @@ devtools/client/shared/components/reps/**
 
 # Ignore devtools preferences files
 devtools/client/preferences/**
+devtools/client/webide/preferences/**
 devtools/shared/preferences/**
 devtools/startup/preferences/devtools-startup.js
 
@@ -180,6 +177,9 @@ devtools/server/tests/unit/babel_and_browserify_script_with_source_map.js
 devtools/server/tests/unit/setBreakpoint*
 devtools/server/tests/unit/sourcemapped.js
 
+# devtools specific format test file
+devtools/server/tests/unit/xpcshell_debugging_script.js
+
 # dom/ exclusions
 dom/abort/**
 dom/animation/**
@@ -343,7 +343,6 @@ services/sync/services-sync.js
 servo/**
 
 # Remote protocol exclusions
-testing/marionette/test_*.js
 testing/marionette/atom.js
 testing/marionette/legacyaction.js
 testing/marionette/client
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index c2965079169d..72d21131d484 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -499,8 +499,7 @@ const gStoragePressureObserver = {
   _lastNotificationTime: -1,
 
   observe(subject, topic, data) {
-    if (topic != "QuotaManager::StoragePressure" ||
-        !Services.prefs.getBoolPref("browser.storageManager.enabled")) {
+    if (topic != "QuotaManager::StoragePressure") {
       return;
     }
 
diff --git a/browser/base/content/test/general/browser_storagePressure_notification.js b/browser/base/content/test/general/browser_storagePressure_notification.js
index 4f1d37f484e3..ee0d15d7a51c 100644
--- a/browser/base/content/test/general/browser_storagePressure_notification.js
+++ b/browser/base/content/test/general/browser_storagePressure_notification.js
@@ -23,7 +23,6 @@ function openAboutPrefPromise() {
 // Test only displaying notification once within the given interval
 add_task(async function() {
   const TEST_NOTIFICATION_INTERVAL_MS = 2000;
-  await SpecialPowers.pushPrefEnv({set: [["browser.storageManager.enabled", true]]});
   await SpecialPowers.pushPrefEnv({set: [["browser.storageManager.pressureNotification.minIntervalMS", TEST_NOTIFICATION_INTERVAL_MS]]});
   // Commenting this to see if we really need it
   // await SpecialPowers.pushPrefEnv({set: [["privacy.reduceTimerPrecision", false]]});
@@ -47,7 +46,6 @@ add_task(async function() {
 
 // Test guiding user to the about:preferences when usage exceeds the given threshold
 add_task(async function() {
-  await SpecialPowers.pushPrefEnv({ set: [["browser.storageManager.enabled", true]] });
   await SpecialPowers.pushPrefEnv({ set: [["browser.storageManager.pressureNotification.minIntervalMS", 0]] });
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "https://example.com");
 
@@ -74,7 +72,6 @@ add_task(async function() {
 // Test not displaying the 2nd notification if one is already being displayed
 add_task(async function() {
   const TEST_NOTIFICATION_INTERVAL_MS = 0;
-  await SpecialPowers.pushPrefEnv({set: [["browser.storageManager.enabled", true]]});
   await SpecialPowers.pushPrefEnv({set: [["browser.storageManager.pressureNotification.minIntervalMS", TEST_NOTIFICATION_INTERVAL_MS]]});
 
   await notifyStoragePressure();
diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm
index 38c7f94b0bf8..ba0733dada2c 100644
--- a/browser/components/customizableui/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/CustomizableWidgets.jsm
@@ -744,7 +744,9 @@ if (Services.prefs.getBoolPref("identity.fxaccounts.enabled")) {
       // We need to use "click" instead of "command" here so openUILink
       // respects different buttons (eg, to open in a new tab).
       item.addEventListener("click", e => {
-        doc.defaultView.openWebLinkIn(tabInfo.url, e);
+        doc.defaultView.openUILink(tabInfo.url, e, {
+          triggeringPrincipal: Services.scriptSecurityManager.createNullPrincipal({})
+        });
         if (doc.defaultView.whereToOpenLink(e) != "current") {
           e.preventDefault();
           e.stopPropagation();
diff --git a/browser/components/customizableui/test/browser_synced_tabs_menu.js b/browser/components/customizableui/test/browser_synced_tabs_menu.js
index b0b2a100cfbc..c211ab7db265 100644
--- a/browser/components/customizableui/test/browser_synced_tabs_menu.js
+++ b/browser/components/customizableui/test/browser_synced_tabs_menu.js
@@ -19,6 +19,8 @@ const DECKINDEX_TABSDISABLED = 1;
 const DECKINDEX_FETCHING = 2;
 const DECKINDEX_NOCLIENTS = 3;
 
+const SAMPLE_TAB_URL = "https://example.com/";
+
 var initialLocation = gBrowser.currentURI.spec;
 var newTab = null;
 
@@ -335,7 +337,7 @@ add_task(async function() {
           // on the second to last page we should have 22 items shown
           // (because we have to show at least NEXT_PAGE_MIN_TABS=5 tabs on the last page)
           for (let i = 1; i <= 77; i++) {
-            allTabsDesktop.push({ title: "Tab #" + i });
+            allTabsDesktop.push({ title: "Tab #" + i, url: SAMPLE_TAB_URL });
           }
           return allTabsDesktop;
         }(),
@@ -343,6 +345,7 @@ add_task(async function() {
     ]);
   };
 
+
   gSync.updateAllUI({ status: UIState.STATUS_SIGNED_IN, lastSync: new Date(),
                       email: "foo@bar.com" });
 
@@ -370,6 +373,7 @@ add_task(async function() {
       node = node.nextSibling;
       is(node.getAttribute("itemtype"), "tab", "node is a tab");
       is(node.getAttribute("label"), "Tab #" + (i + 1), "the tab is the correct one");
+      is(node.getAttribute("targetURI"), SAMPLE_TAB_URL, "url is the correct one");
     }
     let showMoreButton;
     if (showMoreLabel) {
@@ -383,6 +387,14 @@ add_task(async function() {
     return showMoreButton;
   }
 
+  async function checkCanOpenURL() {
+    let tabList = document.getElementById("PanelUI-remotetabs-tabslist");
+    let node = tabList.firstChild.nextSibling;
+    let promiseTabOpened = BrowserTestUtils.waitForLocationChange(gBrowser, SAMPLE_TAB_URL);
+    node.click();
+    await promiseTabOpened;
+  }
+
   let showMoreButton;
   function clickShowMoreButton() {
     let promise = promiseObserverNotified("synced-tabs-menu:test:tabs-updated");
@@ -400,6 +412,6 @@ add_task(async function() {
   await clickShowMoreButton();
 
   checkTabsPage(77, null);
-
-  await hideOverflow();
+  /* calling this will close the overflow menu */
+  await checkCanOpenURL();
 });
diff --git a/browser/components/extensions/ExtensionPopups.jsm b/browser/components/extensions/ExtensionPopups.jsm
index 572f596c90ba..3140d9ee4f59 100644
--- a/browser/components/extensions/ExtensionPopups.jsm
+++ b/browser/components/extensions/ExtensionPopups.jsm
@@ -368,7 +368,7 @@ class BasePopup {
     this.panel.style.setProperty("--arrowpanel-background", background);
     if (background == "#fff") {
       // Set a usable default color that work with the default background-color.
-      this.panel.style.setProperty("--arrowpanel-border-color", "hsla(210,4%,10%,.05)");
+      this.panel.style.setProperty("--arrowpanel-border-color", "hsla(210,4%,10%,.15)");
     }
     this.background = background;
   }
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index c08990d53649..e8656cbf7ca6 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -2767,9 +2767,7 @@ const ContentPermissionIntegration = {
         return new PermissionUI.DesktopNotificationPermissionPrompt(request);
       }
       case "persistent-storage": {
-        if (Services.prefs.getBoolPref("browser.storageManager.enabled")) {
-          return new PermissionUI.PersistentStoragePermissionPrompt(request);
-        }
+        return new PermissionUI.PersistentStoragePermissionPrompt(request);
       }
       case "midi": {
         return new PermissionUI.MIDIPermissionPrompt(request);
diff --git a/browser/components/preferences/in-content/privacy.js b/browser/components/preferences/in-content/privacy.js
index 094d56e6a38a..675fef17de13 100644
--- a/browser/components/preferences/in-content/privacy.js
+++ b/browser/components/preferences/in-content/privacy.js
@@ -337,25 +337,21 @@ var gPrivacyPane = {
       }
     }
 
-    if (Services.prefs.getBoolPref("browser.storageManager.enabled")) {
-      Services.obs.addObserver(this, "sitedatamanager:sites-updated");
-      Services.obs.addObserver(this, "sitedatamanager:updating-sites");
-      let unload = () => {
-        window.removeEventListener("unload", unload);
-        Services.obs.removeObserver(this, "sitedatamanager:sites-updated");
-        Services.obs.removeObserver(this, "sitedatamanager:updating-sites");
-      };
-      window.addEventListener("unload", unload);
-      SiteDataManager.updateSites();
-      setEventListener("clearSiteDataButton", "command",
-        gPrivacyPane.clearSiteData);
-      setEventListener("siteDataSettings", "command",
-        gPrivacyPane.showSiteDataSettings);
-      let url = Services.urlFormatter.formatURLPref("app.support.baseURL") + "storage-permissions";
-      document.getElementById("siteDataLearnMoreLink").setAttribute("href", url);
-      let siteDataGroup = document.getElementById("siteDataGroup");
-      siteDataGroup.removeAttribute("data-hidden-from-search");
-    }
+    Services.obs.addObserver(this, "sitedatamanager:sites-updated");
+    Services.obs.addObserver(this, "sitedatamanager:updating-sites");
+    let unload = () => {
+      window.removeEventListener("unload", unload);
+      Services.obs.removeObserver(this, "sitedatamanager:sites-updated");
+      Services.obs.removeObserver(this, "sitedatamanager:updating-sites");
+    };
+    window.addEventListener("unload", unload);
+    SiteDataManager.updateSites();
+    setEventListener("clearSiteDataButton", "command",
+      gPrivacyPane.clearSiteData);
+    setEventListener("siteDataSettings", "command",
+      gPrivacyPane.showSiteDataSettings);
+    let url = Services.urlFormatter.formatURLPref("app.support.baseURL") + "storage-permissions";
+    document.getElementById("siteDataLearnMoreLink").setAttribute("href", url);
 
     let notificationInfoURL =
       Services.urlFormatter.formatURLPref("app.support.baseURL") + "push";
diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul
index 0ea479eb3a04..d7567e63b991 100644
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -160,7 +160,7 @@
 </groupbox>
 
 <!-- Site Data -->
-<groupbox id="siteDataGroup" hidden="true" data-category="panePrivacy" data-hidden-from-search="true">
+<groupbox id="siteDataGroup" data-category="panePrivacy">
   <caption><label data-l10n-id="sitedata-header"/></caption>
 
   <hbox data-subcategory="sitedata" align="baseline">
diff --git a/browser/components/preferences/in-content/tests/browser_bug731866.js b/browser/components/preferences/in-content/tests/browser_bug731866.js
index 5f58b480e54a..791a07150c6d 100644
--- a/browser/components/preferences/in-content/tests/browser_bug731866.js
+++ b/browser/components/preferences/in-content/tests/browser_bug731866.js
@@ -4,7 +4,6 @@
 ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
 ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 
-const storageManagerDisabled = !SpecialPowers.getBoolPref("browser.storageManager.enabled");
 const browserContainersGroupDisabled = !SpecialPowers.getBoolPref("privacy.userContext.ui.enabled");
 
 function test() {
@@ -22,14 +21,7 @@ function checkElements(expectedPane) {
         element.id === "drmGroup") {
       continue;
     }
-    // The siteDataGroup in the Storage Management project is currently only pref-on on Nightly for testing purpose.
-    // During the test and the transition period, we have to check the pref to see if the siteDataGroup
-    // should be hidden always. This would be a bit bothersome, same as the offlineGroup as below.
-    // However, this checking is necessary to make sure we don't leak the siteDataGroup into beta/release build
-    if (element.id == "siteDataGroup" && storageManagerDisabled) {
-      is_element_hidden(element, "Disabled siteDataGroup should be hidden");
-      continue;
-    }
+
     // The browserContainersGroup is still only pref-on on Nightly
     if (element.id == "browserContainersGroup" && browserContainersGroupDisabled) {
       is_element_hidden(element, "Disabled browserContainersGroup should be hidden");
diff --git a/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_3.js b/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_3.js
index 3ba7cdd4ac19..552c48765b55 100644
--- a/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_3.js
+++ b/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_3.js
@@ -5,8 +5,7 @@
 // Enabling Searching functionatily. Will display search bar form this testcase forward.
 add_task(async function() {
   await SpecialPowers.pushPrefEnv({"set": [
-    ["browser.preferences.search", true],
-    ["browser.storageManager.enabled", true]
+    ["browser.preferences.search", true]
   ]});
 });
 
diff --git a/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_7.js b/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_7.js
index e9749d4dc679..b30705cc9413 100644
--- a/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_7.js
+++ b/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_7.js
@@ -7,8 +7,7 @@ requestLongerTimeout(2);
 // Enabling Searching functionatily. Will display search bar form this testcase forward.
 add_task(async function() {
   await SpecialPowers.pushPrefEnv({"set": [
-    ["browser.preferences.search", true],
-    ["browser.storageManager.enabled", true]
+    ["browser.preferences.search", true]
   ]});
 });
 
diff --git a/browser/components/preferences/in-content/tests/browser_search_within_preferences_1.js b/browser/components/preferences/in-content/tests/browser_search_within_preferences_1.js
index 6a6787a545de..2fce25d6325b 100644
--- a/browser/components/preferences/in-content/tests/browser_search_within_preferences_1.js
+++ b/browser/components/preferences/in-content/tests/browser_search_within_preferences_1.js
@@ -212,49 +212,6 @@ add_task(async function exiting_search_reverts_to_general_pane() {
   BrowserTestUtils.removeTab(gBrowser.selectedTab);
 });
 
-/**
- * Test for "Site Data" case, verifying elements with data-hidden-from-search = true
- * are hidden in search result.
- */
-add_task(async function verify_hidden_from_search_elements_dont_show_up() {
-  await SpecialPowers.pushPrefEnv({ "set": [["browser.storageManager.enabled", false]] });
-  await openPreferencesViaOpenPreferencesAPI("privacy", { leaveOpen: true });
-  let generalPane = gBrowser.contentDocument.getElementById("generalCategory");
-
-  is_element_hidden(generalPane, "Should not be in general");
-
-  // Performs search
-  let searchInput = gBrowser.contentDocument.getElementById("searchInput");
-
-  is(searchInput, gBrowser.contentDocument.activeElement.closest("#searchInput"),
-    "Search input should be focused when visiting preferences");
-
-  let query = "site data";
-  let searchCompletedPromise = BrowserTestUtils.waitForEvent(
-    gBrowser.contentWindow, "PreferencesSearchCompleted", evt => evt.detail == query);
-  EventUtils.sendString(query);
-  await searchCompletedPromise;
-
-  let mainPrefTag = gBrowser.contentDocument.getElementById("mainPrefPane");
-
-  let child = mainPrefTag.querySelector("#siteDataGroup");
-  is_element_hidden(child, "Should be hidden in search results");
-
-  // Takes search off
-  searchCompletedPromise = BrowserTestUtils.waitForEvent(
-    gBrowser.contentWindow, "PreferencesSearchCompleted", evt => evt.detail == "");
-  let count = query.length;
-  while (count--) {
-    EventUtils.sendKey("BACK_SPACE");
-  }
-  await searchCompletedPromise;
-
-  // Checks if back to normal
-  is_element_visible(generalPane, "Should be in generalPane");
-
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
-});
-
 /**
  * Test for if we go to another tab after searching
  */
diff --git a/browser/components/preferences/in-content/tests/browser_search_within_preferences_command.js b/browser/components/preferences/in-content/tests/browser_search_within_preferences_command.js
index c9d6ea1ff63c..ab5e37fe98d4 100644
--- a/browser/components/preferences/in-content/tests/browser_search_within_preferences_command.js
+++ b/browser/components/preferences/in-content/tests/browser_search_within_preferences_command.js
@@ -4,7 +4,6 @@
  * Test for "command" event on search input (when user clicks the x button)
  */
 add_task(async function() {
-  await SpecialPowers.pushPrefEnv({"set": [["browser.storageManager.enabled", false]]});
   await openPreferencesViaOpenPreferencesAPI("privacy", {leaveOpen: true});
   let generalPane = gBrowser.contentDocument.getElementById("generalCategory");
 
diff --git a/browser/modules/SitePermissions.jsm b/browser/modules/SitePermissions.jsm
index fb34716edc10..aa1f7b52995b 100644
--- a/browser/modules/SitePermissions.jsm
+++ b/browser/modules/SitePermissions.jsm
@@ -684,12 +684,6 @@ var gPermissionObject = {
   }
 };
 
-// Delete this entry while being pre-off
-// or the persistent-storage permission would appear in Page info's Permission section
-if (!Services.prefs.getBoolPref("browser.storageManager.enabled")) {
-  delete gPermissionObject["persistent-storage"];
-}
-
 if (!Services.prefs.getBoolPref("dom.webmidi.enabled")) {
   // ESLint gets angry about array versus dot notation here, but some permission
   // names use hyphens. Disabling rule for line to keep things consistent.
diff --git a/browser/modules/test/unit/test_SitePermissions.js b/browser/modules/test/unit/test_SitePermissions.js
index c39b0e721404..3a05d1aa8df5 100644
--- a/browser/modules/test/unit/test_SitePermissions.js
+++ b/browser/modules/test/unit/test_SitePermissions.js
@@ -6,19 +6,13 @@
 ChromeUtils.import("resource:///modules/SitePermissions.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
-const STORAGE_MANAGER_ENABLED = Services.prefs.getBoolPref("browser.storageManager.enabled");
 const RESIST_FINGERPRINTING_ENABLED = Services.prefs.getBoolPref("privacy.resistFingerprinting");
 const MIDI_ENABLED = Services.prefs.getBoolPref("dom.webmidi.enabled");
 
 add_task(async function testPermissionsListing() {
   let expectedPermissions = ["camera", "cookie", "desktop-notification", "focus-tab-by-prompt",
-     "geo", "image", "install", "microphone", "plugin:flash", "popup", "screen", "shortcuts"];
-  if (STORAGE_MANAGER_ENABLED) {
-    // The persistent-storage permission is still only pref-on on Nightly
-    // so we add it only when it's pref-on.
-    // Should remove this checking and add it as default after it is fully pref-on.
-    expectedPermissions.push("persistent-storage");
-  }
+     "geo", "image", "install", "microphone", "plugin:flash", "popup", "screen", "shortcuts",
+     "persistent-storage"];
   if (RESIST_FINGERPRINTING_ENABLED) {
     // Canvas permission should be hidden unless privacy.resistFingerprinting
     // is true.
@@ -113,13 +107,7 @@ add_task(async function testExactHostMatch() {
   let subUri = Services.io.newURI("https://test1.example.com");
 
   let exactHostMatched = ["desktop-notification", "focus-tab-by-prompt", "camera",
-                          "microphone", "screen", "geo"];
-  if (STORAGE_MANAGER_ENABLED) {
-    // The persistent-storage permission is still only pref-on on Nightly
-    // so we add it only when it's pref-on.
-    // Should remove this checking and add it as default after it is fully pref-on.
-    exactHostMatched.push("persistent-storage");
-  }
+                          "microphone", "screen", "geo", "persistent-storage"];
   if (RESIST_FINGERPRINTING_ENABLED) {
     // Canvas permission should be hidden unless privacy.resistFingerprinting
     // is true.
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
index 7726d77c3709..9cbb899c0e4f 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
@@ -16,7 +16,6 @@ let lastTab = null;
 
 var PermissionPrompts = {
   init(libDir) {
-    Services.prefs.setBoolPref("browser.storageManager.enabled", true);
     Services.prefs.setBoolPref("media.navigator.permission.fake", true);
     Services.prefs.setBoolPref("extensions.install.requireBuiltInCerts", false);
     Services.prefs.setBoolPref("signon.rememberSignons", true);
diff --git a/devtools/.eslintrc.js b/devtools/.eslintrc.js
index 2ca546f4affc..c0b2b6d3f8d5 100644
--- a/devtools/.eslintrc.js
+++ b/devtools/.eslintrc.js
@@ -47,6 +47,7 @@ module.exports = {
       "client/scratchpad/**",
       "client/shared/*.jsm",
       "client/shared/widgets/*.jsm",
+      "client/webide/**",
     ],
     "rules": {
       "consistent-return": "off",
@@ -56,6 +57,7 @@ module.exports = {
       "client/framework/**",
       "client/scratchpad/**",
       "client/shared/AppCacheUtils.jsm",
+      "client/webide/**",
     ],
     "rules": {
       "max-nested-callbacks": "off",
@@ -66,6 +68,7 @@ module.exports = {
       "client/scratchpad/**",
       "client/shared/*.jsm",
       "client/shared/widgets/*.jsm",
+      "client/webide/**",
     ],
     "rules": {
       "max-len": "off",
@@ -84,6 +87,7 @@ module.exports = {
       "client/scratchpad/**",
       "client/shared/*.jsm",
       "client/shared/widgets/*.jsm",
+      "client/webide/**",
     ],
     "rules": {
       "mozilla/no-aArgs": "off",
@@ -102,6 +106,7 @@ module.exports = {
       "client/scratchpad/**",
       "client/shared/AppCacheUtils.jsm",
       "client/shared/widgets/*.jsm",
+      "client/webide/**",
     ],
     "rules": {
       "no-shadow": "off",
@@ -110,6 +115,7 @@ module.exports = {
     "files": [
       "client/framework/**",
       "client/scratchpad/**",
+      "client/webide/**",
     ],
     "rules": {
       "strict": "off",
@@ -122,16 +128,21 @@ module.exports = {
       // Note: Bug 1342237 may be removing shadereditor, check before
       // doing more work on enabling these rules.
       "client/shadereditor/**",
+      // Note: Bug 1403944 may be removing webaudioeditor, check before
+      // doing more work on enabling these rules.
+      "client/webaudioeditor/**",
     ],
     "rules": {
       "consistent-return": "off",
       "max-len": "off",
       "mozilla/no-aArgs": "off",
       "mozilla/var-only-at-top-level": "off",
+      "no-redeclare": "off",
       "no-return-assign": "off",
       "no-shadow": "off",
       "no-undef": "off",
       "no-unused-vars": "off",
+      "no-useless-call": "off",
       "strict": "off",
     }
   }, {
diff --git a/devtools/client/aboutdebugging/test/head.js b/devtools/client/aboutdebugging/test/head.js
index eedeb2a1d225..26eb1fee1108 100644
--- a/devtools/client/aboutdebugging/test/head.js
+++ b/devtools/client/aboutdebugging/test/head.js
@@ -15,11 +15,6 @@ Services.scriptloader.loadSubScript(
 const { AddonManager } = ChromeUtils.import("resource://gre/modules/AddonManager.jsm", {});
 const { Management } = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
 
-flags.testing = true;
-registerCleanupFunction(() => {
-  flags.testing = false;
-});
-
 async function openAboutDebugging(page, win) {
   info("opening about:debugging");
   let url = "about:debugging";
diff --git a/devtools/client/commandline/test/head.js b/devtools/client/commandline/test/head.js
index c947a06e08f2..898caa16046d 100644
--- a/devtools/client/commandline/test/head.js
+++ b/devtools/client/commandline/test/head.js
@@ -19,11 +19,6 @@ var testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
 Services.scriptloader.loadSubScript(testDir + "/helpers.js", this);
 Services.scriptloader.loadSubScript(testDir + "/mockCommands.js", this, "UTF-8");
 
-flags.testing = true;
-SimpleTest.registerCleanupFunction(() => {
-  flags.testing = false;
-});
-
 function whenDelayedStartupFinished(aWindow, aCallback) {
   Services.obs.addObserver(function observer(aSubject, aTopic) {
     if (aWindow == aSubject) {
diff --git a/devtools/client/framework/test/browser_ignore_toolbox_network_requests.js b/devtools/client/framework/test/browser_ignore_toolbox_network_requests.js
index 4a9dbd83cafe..01dca058930d 100644
--- a/devtools/client/framework/test/browser_ignore_toolbox_network_requests.js
+++ b/devtools/client/framework/test/browser_ignore_toolbox_network_requests.js
@@ -12,8 +12,7 @@ add_task(async function() {
   // TODO: This test tries to verify the normal behavior of the netmonitor and
   // therefore needs to avoid the explicit check for tests. Bug 1167188 will
   // allow us to remove this workaround.
-  let isTesting = flags.testing;
-  flags.testing = false;
+  await pushPref("devtools.testing", false);
 
   let tab = await addTab(URL_ROOT + "doc_viewsource.html");
   let target = TargetFactory.forTab(tab);
@@ -30,5 +29,4 @@ add_task(async function() {
   await gDevTools.closeToolbox(target);
   tab = target = toolbox = panel = null;
   gBrowser.removeCurrentTab();
-  flags.testing = isTesting;
 });
diff --git a/devtools/client/framework/toolbox.js b/devtools/client/framework/toolbox.js
index ec8651142400..a71c403c80a0 100644
--- a/devtools/client/framework/toolbox.js
+++ b/devtools/client/framework/toolbox.js
@@ -23,6 +23,7 @@ var ChromeUtils = require("ChromeUtils");
 var {gDevTools} = require("devtools/client/framework/devtools");
 var EventEmitter = require("devtools/shared/event-emitter");
 var Telemetry = require("devtools/client/shared/telemetry");
+const { getUnicodeUrl } = require("devtools/client/shared/unicode-url");
 var { attachThread, detachThread } = require("./attach-thread");
 var Menu = require("devtools/client/framework/menu");
 var MenuItem = require("devtools/client/framework/menu-item");
@@ -2057,11 +2058,13 @@ Toolbox.prototype = {
     let title;
     if (this.target.name && this.target.name != this.target.url) {
       const url = this.target.isWebExtension ?
-                  this.target.getExtensionPathName(this.target.url) : this.target.url;
+                    this.target.getExtensionPathName(this.target.url) :
+                    getUnicodeUrl(this.target.url);
       title = L10N.getFormatStr("toolbox.titleTemplate2", this.target.name,
                                                           url);
     } else {
-      title = L10N.getFormatStr("toolbox.titleTemplate1", this.target.url);
+      title = L10N.getFormatStr("toolbox.titleTemplate1",
+                                getUnicodeUrl(this.target.url));
     }
     this.postMessage({
       name: "set-host-title",
@@ -2148,11 +2151,12 @@ Toolbox.prototype = {
       // A frame is checked if it's the selected one.
       let checked = frame.id == this.selectedFrameId;
 
-      let label = frame.url;
-
+      let label;
       if (this.target.isWebExtension) {
         // Show a shorter url for extensions page.
         label = this.target.getExtensionPathName(frame.url);
+      } else {
+        label = getUnicodeUrl(frame.url);
       }
 
       // Create menu item.
diff --git a/devtools/client/inspector/markup/test/head.js b/devtools/client/inspector/markup/test/head.js
index eb5843f2ea52..648426e3f49e 100644
--- a/devtools/client/inspector/markup/test/head.js
+++ b/devtools/client/inspector/markup/test/head.js
@@ -19,12 +19,6 @@ var {ActorRegistryFront} = require("devtools/shared/fronts/actor-registry");
 // lines.
 SimpleTest.requestCompleteLog();
 
-// Set the testing flag on DevToolsUtils and reset it when the test ends
-flags.testing = true;
-registerCleanupFunction(() => {
-  flags.testing = false;
-});
-
 // Toggle this pref on to see all DevTools event communication. This is hugely
 // useful for fixing race conditions.
 // Services.prefs.setBoolPref("devtools.dump.emit", true);
diff --git a/devtools/client/inspector/test/head.js b/devtools/client/inspector/test/head.js
index 6ee7f27d3510..c4f83f0e2305 100644
--- a/devtools/client/inspector/test/head.js
+++ b/devtools/client/inspector/test/head.js
@@ -32,11 +32,6 @@ const {LocalizationHelper} = require("devtools/shared/l10n");
 const INSPECTOR_L10N =
       new LocalizationHelper("devtools/client/locales/inspector.properties");
 
-flags.testing = true;
-registerCleanupFunction(() => {
-  flags.testing = false;
-});
-
 registerCleanupFunction(() => {
   Services.prefs.clearUserPref("devtools.inspector.activeSidebar");
 });
diff --git a/devtools/client/memory/test/chrome/head.js b/devtools/client/memory/test/chrome/head.js
index 4fb618595274..24f038a0ce86 100644
--- a/devtools/client/memory/test/chrome/head.js
+++ b/devtools/client/memory/test/chrome/head.js
@@ -23,8 +23,6 @@ SimpleTest.registerCleanupFunction(function() {
 
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 var { immutableUpdate } = DevToolsUtils;
-var flags = require("devtools/shared/flags");
-flags.testing = true;
 
 var constants = require("devtools/client/memory/constants");
 var {
diff --git a/devtools/client/memory/test/unit/head.js b/devtools/client/memory/test/unit/head.js
index a1a39f5f429c..9484ec28e6e0 100644
--- a/devtools/client/memory/test/unit/head.js
+++ b/devtools/client/memory/test/unit/head.js
@@ -10,10 +10,13 @@ var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {}
 
 var Services = require("Services");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
-var flags = require("devtools/shared/flags");
-flags.testing = true;
-flags.wantLogging = true;
-flags.wantVerbose = false;
+
+Services.prefs.setBoolPref("devtools.testing", true);
+Services.prefs.setBoolPref("devtools.debugger.log", true);
+registerCleanupFunction(() => {
+  Services.prefs.clearUserPref("devtools.testing");
+  Services.prefs.clearUserPref("devtools.debugger.log");
+});
 
 var { OS } = require("resource://gre/modules/osfile.jsm");
 var { FileUtils } = require("resource://gre/modules/FileUtils.jsm");
diff --git a/devtools/client/netmonitor/src/utils/firefox/open-request-in-tab.js b/devtools/client/netmonitor/src/utils/firefox/open-request-in-tab.js
index 50939d863a58..45749b789882 100644
--- a/devtools/client/netmonitor/src/utils/firefox/open-request-in-tab.js
+++ b/devtools/client/netmonitor/src/utils/firefox/open-request-in-tab.js
@@ -3,6 +3,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /* eslint-disable mozilla/reject-some-requires */
 
+// This file is a chrome-API-dependent version of the module
+// devtools/client/netmonitor/src/utils/open-request-in-tab.js, so that it can
+// take advantage of utilizing chrome APIs. But because of this, it isn't
+// intended to be used in Chrome-API-free applications, such as the Launchpad.
+//
+// Please keep in mind that if the feature in this file has changed, don't
+// forget to also change that accordingly in
+// devtools/client/netmonitor/src/utils/open-request-in-tab.js.
+
 "use strict";
 
 let { Cc, Ci } = require("chrome");
diff --git a/devtools/client/netmonitor/src/utils/open-request-in-tab.js b/devtools/client/netmonitor/src/utils/open-request-in-tab.js
index edda8bbc5aea..d7a842a8f446 100644
--- a/devtools/client/netmonitor/src/utils/open-request-in-tab.js
+++ b/devtools/client/netmonitor/src/utils/open-request-in-tab.js
@@ -2,6 +2,16 @@
  * 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/. */
 
+// This file is a chrome-API-free version of the module
+// devtools/client/netmonitor/src/utils/firefox/open-request-in-tab.js, so that
+// it can be used in Chrome-API-free applications, such as the Launchpad. But
+// because of this, it cannot take advantage of utilizing chrome APIs and should
+// implement the similar functionalities on its own.
+//
+// Please keep in mind that if the feature in this file has changed, don't
+// forget to also change that accordingly in
+// devtools/client/netmonitor/src/utils/firefox/open-request-in-tab.js.
+
 "use strict";
 
 const Services = require("Services");
diff --git a/devtools/client/netmonitor/src/utils/request-utils.js b/devtools/client/netmonitor/src/utils/request-utils.js
index 8f843badb7b3..0a4df69e7df4 100644
--- a/devtools/client/netmonitor/src/utils/request-utils.js
+++ b/devtools/client/netmonitor/src/utils/request-utils.js
@@ -6,6 +6,9 @@
 
 "use strict";
 
+const { getUnicodeUrl, getUnicodeUrlPath, getUnicodeHostname } =
+  require("devtools/client/shared/unicode-url");
+
 const {
   UPDATE_PROPS,
 } = require("devtools/client/netmonitor/src/constants");
@@ -120,22 +123,6 @@ function writeHeaderText(headers) {
   return headers.map(({name, value}) => name + ": " + value).join("\n");
 }
 
-/**
- * Convert a string into unicode if string is valid.
- * If there is a malformed URI sequence, it returns input string.
- *
- * @param {string} url - a string
- * @return {string} unicode string
- */
-function decodeUnicodeUrl(string) {
-  try {
-    return decodeURIComponent(string);
-  } catch (err) {
-    // Ignore error and return input string directly.
-  }
-  return string;
-}
-
 /**
  * Decode base64 string.
  *
@@ -175,7 +162,7 @@ function getAbbreviatedMimeType(mimeType) {
  */
 function getUrlBaseName(url) {
   const pathname = (new URL(url)).pathname;
-  return decodeUnicodeUrl(
+  return getUnicodeUrlPath(
     pathname.replace(/\S*\//, "") || pathname || "/");
 }
 
@@ -196,27 +183,27 @@ function getUrlQuery(url) {
  * @return {string} unicode basename and query portions of a url
  */
 function getUrlBaseNameWithQuery(url) {
-  return getUrlBaseName(url) + decodeUnicodeUrl((new URL(url)).search);
+  return getUrlBaseName(url) + getUnicodeUrlPath((new URL(url)).search);
 }
 
 /**
- * Helpers for getting unicode hostname portion of an URL.
+ * Helpers for getting hostname portion of an URL.
  *
  * @param {string} url - url string
  * @return {string} unicode hostname of a url
  */
 function getUrlHostName(url) {
-  return decodeUnicodeUrl((new URL(url)).hostname);
+  return new URL(url).hostname;
 }
 
 /**
- * Helpers for getting unicode host portion of an URL.
+ * Helpers for getting host portion of an URL.
  *
  * @param {string} url - url string
  * @return {string} unicode host of a url
  */
 function getUrlHost(url) {
-  return decodeUnicodeUrl((new URL(url)).host);
+  return new URL(url).host;
 }
 
 /**
@@ -237,9 +224,22 @@ function getUrlDetails(url) {
   let baseNameWithQuery = getUrlBaseNameWithQuery(url);
   let host = getUrlHost(url);
   let hostname = getUrlHostName(url);
-  let unicodeUrl = decodeUnicodeUrl(url);
+  let unicodeUrl = getUnicodeUrl(url);
   let scheme = getUrlScheme(url);
 
+  // If the hostname contains unreadable ASCII characters, we need to do the
+  // following two steps:
+  // 1. Converting the unreadable hostname to a readable Unicode domain name.
+  //    For example, converting xn--g6w.xn--8pv into a Unicode domain name.
+  // 2. Replacing the unreadable hostname portion in the `host` with the
+  //    readable hostname.
+  //    For example, replacing xn--g6w.xn--8pv:8000 with [Unicode domain]:8000
+  // After finishing the two steps, we get a readable `host`.
+  const unicodeHostname = getUnicodeHostname(hostname);
+  if (unicodeHostname !== hostname) {
+    host = host.replace(hostname, unicodeHostname);
+  }
+
   // Mark local hosts specially, where "local" is  as defined in the W3C
   // spec for secure contexts.
   // http://www.w3.org/TR/powerful-features/
@@ -277,8 +277,8 @@ function parseQueryString(query) {
   return query.replace(/^[?&]/, "").split("&").map(e => {
     let param = e.split("=");
     return {
-      name: param[0] ? decodeUnicodeUrl(param[0]) : "",
-      value: param[1] ? decodeUnicodeUrl(param[1]) : "",
+      name: param[0] ? getUnicodeUrlPath(param[0]) : "",
+      value: param[1] ? getUnicodeUrlPath(param[1]) : "",
     };
   });
 }
@@ -297,8 +297,8 @@ function parseFormData(sections) {
   return sections.replace(/^&/, "").split("&").map(e => {
     let param = e.split("=");
     return {
-      name: param[0] ? decodeUnicodeUrl(param[0]) : "",
-      value: param[1] ? decodeUnicodeUrl(param[1]) : "",
+      name: param[0] ? getUnicodeUrlPath(param[0]) : "",
+      value: param[1] ? getUnicodeUrlPath(param[1]) : "",
     };
   });
 }
@@ -491,7 +491,6 @@ module.exports = {
   fetchNetworkUpdatePacket,
   formDataURI,
   writeHeaderText,
-  decodeUnicodeUrl,
   getAbbreviatedMimeType,
   getEndTime,
   getFormattedProtocol,
diff --git a/devtools/client/netmonitor/test/head.js b/devtools/client/netmonitor/test/head.js
index a8c80f8f678d..f1217a91f54c 100644
--- a/devtools/client/netmonitor/test/head.js
+++ b/devtools/client/netmonitor/test/head.js
@@ -18,8 +18,8 @@ const {
   getFormattedIPAndPort,
   getFormattedTime,
 } = require("devtools/client/netmonitor/src/utils/format-utils");
+const { getUnicodeUrl } = require("devtools/client/shared/unicode-url");
 const {
-  decodeUnicodeUrl,
   getFormattedProtocol,
   getUrlBaseName,
   getUrlHost,
@@ -410,7 +410,7 @@ function verifyRequestItemTarget(document, requestList, requestItem, method,
 
   let target = document.querySelectorAll(".request-list-item")[visibleIndex];
   // Bug 1414981 - Request URL should not show #hash
-  let unicodeUrl = decodeUnicodeUrl(url).split("#")[0];
+  let unicodeUrl = getUnicodeUrl(url.split("#")[0]);
   let name = getUrlBaseName(url);
   let query = getUrlQuery(url);
   let host = getUrlHost(url);
diff --git a/devtools/client/netmonitor/webpack.config.js b/devtools/client/netmonitor/webpack.config.js
index 49f3922db90b..a92a6c697cf5 100644
--- a/devtools/client/netmonitor/webpack.config.js
+++ b/devtools/client/netmonitor/webpack.config.js
@@ -88,6 +88,7 @@ let webpackConfig = {
       "devtools/shared/fronts/timeline": path.join(__dirname, "../../client/shared/webpack/shims/fronts-timeline-shim"),
       "devtools/shared/platform/clipboard": path.join(__dirname, "../../client/shared/webpack/shims/platform-clipboard-stub"),
       "devtools/client/netmonitor/src/utils/firefox/open-request-in-tab": path.join(__dirname, "src/utils/open-request-in-tab"),
+      "devtools/client/shared/unicode-url": path.join(__dirname, "../../client/shared/webpack/shims/unicode-url-stub"),
 
       // Locales need to be explicitly mapped to the en-US subfolder
       "devtools/client/locales": path.join(__dirname, "../../client/locales/en-US"),
diff --git a/devtools/client/performance-new/test/chrome/head.js b/devtools/client/performance-new/test/chrome/head.js
index c0794541aad8..859f2be2db1b 100644
--- a/devtools/client/performance-new/test/chrome/head.js
+++ b/devtools/client/performance-new/test/chrome/head.js
@@ -15,9 +15,7 @@ var { require } = BrowserLoader({
 const EventEmitter = require("devtools/shared/event-emitter");
 const { perfDescription } = require("devtools/shared/specs/perf");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
-const flags = require("devtools/shared/flags");
 
-flags.testing = true;
 let EXPECTED_DTU_ASSERT_FAILURE_COUNT = 0;
 SimpleTest.registerCleanupFunction(function() {
   if (DevToolsUtils.assertionFailureCount !== EXPECTED_DTU_ASSERT_FAILURE_COUNT) {
diff --git a/devtools/client/performance/components/test/head.js b/devtools/client/performance/components/test/head.js
index 7957e3710129..cc5307181d4d 100644
--- a/devtools/client/performance/components/test/head.js
+++ b/devtools/client/performance/components/test/head.js
@@ -14,7 +14,6 @@ let flags = require("devtools/shared/flags");
 let { TargetFactory } = require("devtools/client/framework/target");
 let { Toolbox } = require("devtools/client/framework/toolbox");
 
-flags.testing = true;
 let { require: browserRequire } = BrowserLoader({
   baseURI: "resource://devtools/client/performance/",
   window
diff --git a/devtools/client/performance/test/head.js b/devtools/client/performance/test/head.js
index 40daa03a21da..d5958926fb7a 100644
--- a/devtools/client/performance/test/head.js
+++ b/devtools/client/performance/test/head.js
@@ -52,11 +52,8 @@ const key = (id, win = window) => {
 
 // Don't pollute global scope.
 (() => {
-  const flags = require("devtools/shared/flags");
   const PrefUtils = require("devtools/client/performance/test/helpers/prefs");
 
-  flags.testing = true;
-
   // Make sure all the prefs are reverted to their defaults once tests finish.
   let stopObservingPrefs = PrefUtils.whenUnknownPrefChanged("devtools.performance",
     pref => {
@@ -71,7 +68,6 @@ const key = (id, win = window) => {
 
   registerCleanupFunction(() => {
     info("finish() was called, cleaning up...");
-    flags.testing = false;
 
     PrefUtils.rollbackPrefsToDefault();
     stopObservingPrefs();
diff --git a/devtools/client/responsive.html/test/browser/head.js b/devtools/client/responsive.html/test/browser/head.js
index 085dfe6a3b81..a53d3e80adf5 100644
--- a/devtools/client/responsive.html/test/browser/head.js
+++ b/devtools/client/responsive.html/test/browser/head.js
@@ -48,14 +48,12 @@ SimpleTest.waitForExplicitFinish();
 // should be enough.
 requestLongerTimeout(2);
 
-flags.testing = true;
 Services.prefs.setCharPref("devtools.devices.url", TEST_URI_ROOT + "devices.json");
 // The appearance of this notification causes intermittent behavior in some tests that
 // send mouse events, since it causes the content to shift when it appears.
 Services.prefs.setBoolPref("devtools.responsive.reloadNotification.enabled", false);
 
 registerCleanupFunction(async () => {
-  flags.testing = false;
   Services.prefs.clearUserPref("devtools.devices.url");
   Services.prefs.clearUserPref("devtools.responsive.reloadNotification.enabled");
   Services.prefs.clearUserPref("devtools.responsive.html.displayedDeviceList");
diff --git a/devtools/client/responsive.html/test/unit/head.js b/devtools/client/responsive.html/test/unit/head.js
index 6d79b84022ed..96c08ee0e4d8 100644
--- a/devtools/client/responsive.html/test/unit/head.js
+++ b/devtools/client/responsive.html/test/unit/head.js
@@ -8,12 +8,12 @@
 const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 
 const promise = require("promise");
+const Services = require("Services");
 const Store = require("devtools/client/responsive.html/store");
 
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 
-const flags = require("devtools/shared/flags");
-flags.testing = true;
+Services.prefs.setBoolPref("devtools.testing", true);
 registerCleanupFunction(() => {
-  flags.testing = false;
+  Services.prefs.clearUserPref("devtools.testing");
 });
diff --git a/devtools/client/scratchpad/test/head.js b/devtools/client/scratchpad/test/head.js
index a2e0278dfed1..186e10f0dd73 100644
--- a/devtools/client/scratchpad/test/head.js
+++ b/devtools/client/scratchpad/test/head.js
@@ -11,17 +11,11 @@ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {}
 const {gDevTools} = require("devtools/client/framework/devtools");
 const Services = require("Services");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
-const flags = require("devtools/shared/flags");
 const promise = require("promise");
 const defer = require("devtools/shared/defer");
 
 var gScratchpadWindow; // Reference to the Scratchpad chrome window object
 
-flags.testing = true;
-registerCleanupFunction(() => {
-  flags.testing = false;
-});
-
 /**
  * Open a Scratchpad window.
  *
diff --git a/devtools/client/shared/components/Frame.js b/devtools/client/shared/components/Frame.js
index e478e79b306a..acb5bfd7294f 100644
--- a/devtools/client/shared/components/Frame.js
+++ b/devtools/client/shared/components/Frame.js
@@ -7,6 +7,8 @@
 const { Component } = require("devtools/client/shared/vendor/react");
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
+const { getUnicodeUrl, getUnicodeUrlPath, getUnicodeHostname } =
+  require("devtools/client/shared/unicode-url");
 const { getSourceNames, parseURL, isScratchpadScheme, getSourceMappedFile } =
   require("devtools/client/shared/source-utils");
 const { LocalizationHelper } = require("devtools/shared/l10n");
@@ -133,6 +135,10 @@ class Frame extends Component {
     let column = frame.column != void 0 ? Number(frame.column) : null;
 
     const { short, long, host } = getSourceNames(source);
+    const unicodeShort = getUnicodeUrlPath(short);
+    const unicodeLong  = getUnicodeUrl(long);
+    const unicodeHost  = host ? getUnicodeHostname(host) : "";
+
     // Reparse the URL to determine if we should link this; `getSourceNames`
     // has already cached this indirectly. We don't want to attempt to
     // link to "self-hosted" and "(unknown)". However, we do want to link
@@ -144,7 +150,7 @@ class Frame extends Component {
     const elements = [];
     const sourceElements = [];
     let sourceEl;
-    let tooltip = long;
+    let tooltip = unicodeLong;
 
     // Exclude all falsy values, including `0`, as line numbers start with 1.
     if (line) {
@@ -177,7 +183,7 @@ class Frame extends Component {
       }
     }
 
-    let displaySource = showFullSourceUrl ? long : short;
+    let displaySource = showFullSourceUrl ? unicodeLong : unicodeShort;
     if (isSourceMapped) {
       displaySource = getSourceMappedFile(displaySource);
     } else if (showEmptyPathAsHost && (displaySource === "" || displaySource === "/")) {
@@ -238,12 +244,12 @@ class Frame extends Component {
     }
     elements.push(sourceEl);
 
-    if (showHost && host) {
+    if (showHost && unicodeHost) {
       elements.push(" ");
       elements.push(dom.span({
         key: "host",
         className: "frame-link-host",
-      }, host));
+      }, unicodeHost));
     }
 
     return dom.span(attributes, ...elements);
diff --git a/devtools/client/shared/components/test/mochitest/head.js b/devtools/client/shared/components/test/mochitest/head.js
index 9ec43e103d6b..b2a024216b1b 100644
--- a/devtools/client/shared/components/test/mochitest/head.js
+++ b/devtools/client/shared/components/test/mochitest/head.js
@@ -15,11 +15,9 @@ var Services = require("Services");
 var { DebuggerServer } = require("devtools/server/main");
 var { DebuggerClient } = require("devtools/shared/client/debugger-client");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
-var flags = require("devtools/shared/flags");
 var { TargetFactory } = require("devtools/client/framework/target");
 var { Toolbox } = require("devtools/client/framework/toolbox");
 
-flags.testing = true;
 var { require: browserRequire } = BrowserLoader({
   baseURI: "resource://devtools/client/shared/",
   window
diff --git a/devtools/client/shared/moz.build b/devtools/client/shared/moz.build
index 026ea8308633..677ff18eae9e 100644
--- a/devtools/client/shared/moz.build
+++ b/devtools/client/shared/moz.build
@@ -53,6 +53,7 @@ DevToolsModules(
     'telemetry.js',
     'theme.js',
     'undo.js',
+    'unicode-url.js',
     'view-source.js',
     'webgl-utils.js',
     'zoom-keys.js',
diff --git a/devtools/client/shared/redux/middleware/test/head.js b/devtools/client/shared/redux/middleware/test/head.js
index 836a70071058..8d2b5b3dfee8 100644
--- a/devtools/client/shared/redux/middleware/test/head.js
+++ b/devtools/client/shared/redux/middleware/test/head.js
@@ -7,9 +7,6 @@
 "use strict";
 
 const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
-const flags = require("devtools/shared/flags");
-
-flags.testing = true;
 
 function waitUntilState(store, predicate) {
   return new Promise(resolve => {
diff --git a/devtools/client/shared/test/browser_telemetry_button_responsive.js b/devtools/client/shared/test/browser_telemetry_button_responsive.js
index 003cfed66f8b..fdc027a34337 100644
--- a/devtools/client/shared/test/browser_telemetry_button_responsive.js
+++ b/devtools/client/shared/test/browser_telemetry_button_responsive.js
@@ -17,13 +17,13 @@ const asyncStorage = require("devtools/shared/async-storage");
 // should be enough.
 requestLongerTimeout(2);
 
-flags.testing = true;
+Services.prefs.setBoolPref("devtools.testing", true);
 Services.prefs.clearUserPref("devtools.responsive.html.displayedDeviceList");
 Services.prefs.setCharPref("devtools.devices.url",
   "http://example.com/browser/devtools/client/responsive.html/test/browser/devices.json");
 
 registerCleanupFunction(() => {
-  flags.testing = false;
+  Services.prefs.clearUserPref("devtools.testing");
   Services.prefs.clearUserPref("devtools.devices.url");
   Services.prefs.clearUserPref("devtools.responsive.html.displayedDeviceList");
   asyncStorage.removeItem("devtools.devices.url_cache");
diff --git a/devtools/client/shared/test/shared-head.js b/devtools/client/shared/test/shared-head.js
index 1b9a151746ec..9340c1990bd1 100644
--- a/devtools/client/shared/test/shared-head.js
+++ b/devtools/client/shared/test/shared-head.js
@@ -25,7 +25,6 @@ const {loader, require} = scopedCuImport("resource://devtools/shared/Loader.jsm"
 const {gDevTools} = require("devtools/client/framework/devtools");
 const {TargetFactory} = require("devtools/client/framework/target");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
-const flags = require("devtools/shared/flags");
 let promise = require("promise");
 let defer = require("devtools/shared/defer");
 const Services = require("Services");
@@ -109,9 +108,7 @@ function loadFrameScriptUtils(browser = gBrowser.selectedBrowser) {
   return mm;
 }
 
-flags.testing = true;
 registerCleanupFunction(() => {
-  flags.testing = false;
   Services.prefs.clearUserPref("devtools.dump.emit");
   Services.prefs.clearUserPref("devtools.toolbox.host");
   Services.prefs.clearUserPref("devtools.toolbox.previousHost");
diff --git a/devtools/client/shared/test/unit/test_unicode-url.js b/devtools/client/shared/test/unit/test_unicode-url.js
new file mode 100644
index 000000000000..ceacccbba163
--- /dev/null
+++ b/devtools/client/shared/test/unit/test_unicode-url.js
@@ -0,0 +1,240 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * Tests utility functions contained in `unicode-url.js`
+ */
+
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { getUnicodeUrl, getUnicodeUrlPath, getUnicodeHostname } =
+  require("devtools/client/shared/unicode-url");
+
+// List of URLs used to test Unicode URL conversion
+const TEST_URLS = [
+  // Type:     Readable ASCII URLs
+  // Expected: All of Unicode versions should equal to the raw.
+  {
+    raw: "https://example.org",
+    expectedUnicode: "https://example.org",
+  },
+  {
+    raw: "http://example.org",
+    expectedUnicode: "http://example.org",
+  },
+  {
+    raw: "ftp://example.org",
+    expectedUnicode: "ftp://example.org",
+  },
+  {
+    raw: "https://example.org.",
+    expectedUnicode: "https://example.org.",
+  },
+  {
+    raw: "https://example.org/",
+    expectedUnicode: "https://example.org/",
+  },
+  {
+    raw: "https://example.org/test",
+    expectedUnicode: "https://example.org/test",
+  },
+  {
+    raw: "https://example.org/test.html",
+    expectedUnicode: "https://example.org/test.html",
+  },
+  {
+    raw: "https://example.org/test.html?one=1&two=2",
+    expectedUnicode: "https://example.org/test.html?one=1&two=2",
+  },
+  {
+    raw: "https://example.org/test.html#here",
+    expectedUnicode: "https://example.org/test.html#here",
+  },
+  {
+    raw: "https://example.org/test.html?one=1&two=2#here",
+    expectedUnicode: "https://example.org/test.html?one=1&two=2#here",
+  },
+  // Type:     Unreadable URLs with either Punycode domain names or URI-encoded
+  //           paths
+  // Expected: Unreadable domain names and URI-encoded paths should be converted
+  //           to readable Unicode.
+  {
+    raw: "https://xn--g6w.xn--8pv/test.html",
+    // Do not type Unicode characters directly, because this test file isn't
+    // specified with a known encoding.
+    expectedUnicode: "https://\u6e2c.\u672c/test.html",
+  },
+  {
+    raw: "https://example.org/%E6%B8%AC%E8%A9%A6.html",
+    // Do not type Unicode characters directly, because this test file isn't
+    // specified with a known encoding.
+    expectedUnicode: "https://example.org/\u6e2c\u8a66.html",
+  },
+  {
+    raw: "https://example.org/test.html?One=%E4%B8%80",
+    // Do not type Unicode characters directly, because this test file isn't
+    // specified with a known encoding.
+    expectedUnicode: "https://example.org/test.html?One=\u4e00",
+  },
+  {
+    raw: "https://example.org/test.html?%E4%B8%80=1",
+    // Do not type Unicode characters directly, because this test file isn't
+    // specified with a known encoding.
+    expectedUnicode: "https://example.org/test.html?\u4e00=1",
+  },
+  {
+    raw: "https://xn--g6w.xn--8pv/%E6%B8%AC%E8%A9%A6.html" +
+         "?%E4%B8%80=%E4%B8%80" +
+         "#%E6%AD%A4",
+    // Do not type Unicode characters directly, because this test file isn't
+    // specified with a known encoding.
+    expectedUnicode: "https://\u6e2c.\u672c/\u6e2c\u8a66.html" +
+                     "?\u4e00=\u4e00" +
+                     "#\u6b64",
+  },
+  // Type:     data: URIs
+  // Expected: All should not be converted.
+  {
+    raw: "data:text/plain;charset=UTF-8;Hello%20world",
+    expectedUnicode: "data:text/plain;charset=UTF-8;Hello%20world",
+  },
+  {
+    raw: "data:text/plain;charset=UTF-8;%E6%B8%AC%20%E8%A9%A6",
+    expectedUnicode: "data:text/plain;charset=UTF-8;%E6%B8%AC%20%E8%A9%A6",
+  },
+  {
+    raw: "data:image/png;base64,iVBORw0KGgoAAA" +
+         "ANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4" +
+         "//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU" +
+         "5ErkJggg==",
+    expectedUnicode: "data:image/png;base64,iVBORw0KGgoAAA" +
+                     "ANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4" +
+                     "//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU" +
+                     "5ErkJggg==",
+  },
+  // Type:     Malformed URLs
+  // Expected: All should not be converted.
+  {
+    raw: "://example.org/test",
+    expectedUnicode: "://example.org/test",
+  },
+  {
+    raw: "://xn--g6w.xn--8pv/%E6%B8%AC%E8%A9%A6.html" +
+         "?%E4%B8%80=%E4%B8%80",
+    expectedUnicode: "://xn--g6w.xn--8pv/%E6%B8%AC%E8%A9%A6.html" +
+                     "?%E4%B8%80=%E4%B8%80",
+  },
+  {
+    // %E8%A9 isn't a valid UTF-8 code, so this URL is malformed.
+    raw: "https://xn--g6w.xn--8pv/%E6%B8%AC%E8%A9",
+    expectedUnicode: "https://xn--g6w.xn--8pv/%E6%B8%AC%E8%A9",
+  },
+];
+
+// List of hostanmes used to test Unicode hostname conversion
+const TEST_HOSTNAMES = [
+  // Type:     Readable ASCII hostnames
+  // Expected: All of Unicode versions should equal to the raw.
+  {
+    raw: "example",
+    expectedUnicode: "example",
+  },
+  {
+    raw: "example.org",
+    expectedUnicode: "example.org",
+  },
+  // Type:     Unreadable Punycode hostnames
+  // Expected: Punycode should be converted to readable Unicode.
+  {
+    raw: "xn--g6w",
+    // Do not type Unicode characters directly, because this test file isn't
+    // specified with a known encoding.
+    expectedUnicode: "\u6e2c",
+  },
+  {
+    raw: "xn--g6w.xn--8pv",
+    // Do not type Unicode characters directly, because this test file isn't
+    // specified with a known encoding.
+    expectedUnicode: "\u6e2c.\u672c",
+  },
+];
+
+// List of URL paths used to test Unicode URL path conversion
+const TEST_URL_PATHS = [
+  // Type:     Readable ASCII URL paths
+  // Expected: All of Unicode versions should equal to the raw.
+  {
+    raw: "test",
+    expectedUnicode: "test",
+  },
+  {
+    raw: "/",
+    expectedUnicode: "/",
+  },
+  {
+    raw: "/test",
+    expectedUnicode: "/test",
+  },
+  {
+    raw: "/test.html?one=1&two=2#here",
+    expectedUnicode: "/test.html?one=1&two=2#here",
+  },
+  // Type:     Unreadable URI-encoded URL paths
+  // Expected: URL paths should be converted to readable Unicode.
+  {
+    raw: "/%E6%B8%AC%E8%A9%A6",
+    // Do not type Unicode characters directly, because this test file isn't
+    // specified with a known encoding.
+    expectedUnicode: "/\u6e2c\u8a66",
+  },
+  {
+    raw: "/%E6%B8%AC%E8%A9%A6.html",
+    // Do not type Unicode characters directly, because this test file isn't
+    // specified with a known encoding.
+    expectedUnicode: "/\u6e2c\u8a66.html",
+  },
+  {
+    raw: "/%E6%B8%AC%E8%A9%A6.html" +
+         "?%E4%B8%80=%E4%B8%80&%E4%BA%8C=%E4%BA%8C" +
+         "#%E6%AD%A4",
+    // Do not type Unicode characters directly, because this test file isn't
+    // specified with a known encoding.
+    expectedUnicode: "/\u6e2c\u8a66.html" +
+                     "?\u4e00=\u4e00&\u4e8c=\u4e8c" +
+                     "#\u6b64",
+  },
+  // Type:     Malformed URL paths
+  // Expected: All should not be converted.
+  {
+    // %E8%A9 isn't a valid UTF-8 code, so this URL is malformed.
+    raw: "/%E6%B8%AC%E8%A9",
+    expectedUnicode: "/%E6%B8%AC%E8%A9",
+  },
+];
+
+function run_test() {
+  // Test URLs
+  for (let url of TEST_URLS) {
+    let result = getUnicodeUrl(url.raw);
+    equal(result, url.expectedUnicode,
+          "Test getUnicodeUrl: " + url.raw +
+            " should be unicodized to " + url.expectedUnicode);
+  }
+
+  // Test hostnames
+  for (let hostname of TEST_HOSTNAMES) {
+    let result = getUnicodeHostname(hostname.raw);
+    equal(result, hostname.expectedUnicode,
+          "Test getUnicodeHostname: " + hostname.raw +
+            " should be unicodized to " + hostname.expectedUnicode);
+  }
+
+  // Test URL paths
+  for (let urlPath of TEST_URL_PATHS) {
+    let result = getUnicodeUrlPath(urlPath.raw);
+    equal(result, urlPath.expectedUnicode,
+          "Test getUnicodeUrlPath: " + urlPath.raw +
+            " should be unicodized to " + urlPath.expectedUnicode);
+  }
+}
diff --git a/devtools/client/shared/test/unit/xpcshell.ini b/devtools/client/shared/test/unit/xpcshell.ini
index 99d6d1bb6da3..dc0a61ab26db 100644
--- a/devtools/client/shared/test/unit/xpcshell.ini
+++ b/devtools/client/shared/test/unit/xpcshell.ini
@@ -25,5 +25,6 @@ support-files =
 [test_source-utils.js]
 [test_suggestion-picker.js]
 [test_undoStack.js]
+[test_unicode-url.js]
 [test_VariablesView_filtering-without-controller.js]
 [test_VariablesView_getString_promise.js]
diff --git a/devtools/client/shared/unicode-url.js b/devtools/client/shared/unicode-url.js
new file mode 100644
index 000000000000..e6da095555cf
--- /dev/null
+++ b/devtools/client/shared/unicode-url.js
@@ -0,0 +1,115 @@
+/* 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";
+
+// This file is a chrome-API-dependent version of the module
+// devtools/client/shared/webpack/shims/unicode-url-stub.js, so that it can
+// take advantage of utilizing chrome APIs. But because of this, it isn't
+// intended to be used in Chrome-API-free applications, such as the Launchpad.
+//
+// Please keep in mind that if the feature in this file has changed, don't
+// forget to also change that accordingly in
+// devtools/client/shared/webpack/shims/unicode-url-stub.js.
+
+const { Cc, Ci } = require("chrome");
+const idnService =
+        Cc["@mozilla.org/network/idn-service;1"].getService(Ci.nsIIDNService);
+
+/**
+ * Gets a readble Unicode hostname from a hostname.
+ *
+ * If the `hostname` is a readable ASCII hostname, such as example.org, then
+ * this function will simply return the original `hostname`.
+ *
+ * If the `hostname` is a Punycode hostname representing a Unicode domain name,
+ * such as xn--g6w.xn--8pv, then this function will return the readable Unicode
+ * domain name by decoding the Punycode hostname.
+ *
+ * @param {string}  hostname
+ *                  the hostname from which the Unicode hostname will be
+ *                  parsed, such as example.org, xn--g6w.xn--8pv.
+ * @return {string} The Unicode hostname. It may be the same as the `hostname`
+ *                  passed to this function if the `hostname` itself is
+ *                  a readable ASCII hostname or a Unicode hostname.
+ */
+function getUnicodeHostname(hostname) {
+  return idnService.convertToDisplayIDN(hostname, {});
+}
+
+/**
+ * Gets a readble Unicode URL pathname from a URL pathname.
+ *
+ * If the `urlPath` is a readable ASCII URL pathname, such as /a/b/c.js, then
+ * this function will simply return the original `urlPath`.
+ *
+ * If the `urlPath` is a URI-encoded pathname, such as %E8%A9%A6/%E6%B8%AC.js,
+ * then this function will return the readable Unicode pathname.
+ *
+ * If the `urlPath` is a malformed URL pathname, then this function will simply
+ * return the original `urlPath`.
+ *
+ * @param {string}  urlPath
+ *                  the URL path from which the Unicode URL path will be parsed,
+ *                  such as /a/b/c.js, %E8%A9%A6/%E6%B8%AC.js.
+ * @return {string} The Unicode URL Path. It may be the same as the `urlPath`
+ *                  passed to this function if the `urlPath` itself is a readable
+ *                  ASCII url or a Unicode url.
+ */
+function getUnicodeUrlPath(urlPath) {
+  try {
+    return decodeURIComponent(urlPath);
+  } catch (err) {
+    dump("Warning: getUnicodeUrlPath failed to get a Unicode URL from" +
+            `${urlPath}, reason: ${err}`);
+  }
+  return urlPath;
+}
+
+/**
+ * Gets a readable Unicode URL from a URL.
+ *
+ * If the `url` is a readable ASCII URL, such as http://example.org/a/b/c.js,
+ * then this function will simply return the original `url`.
+ *
+ * If the `url` includes either an unreadable Punycode domain name or an
+ * unreadable URI-encoded pathname, such as
+ * http://xn--g6w.xn--8pv/%E8%A9%A6/%E6%B8%AC.js, then this function will return
+ * the readable URL by decoding all its unreadable URL components to Unicode
+ * characters.
+ *
+ * If the `url` is a malformed URL, then this function will return the original
+ * `url`.
+ *
+ * If the `url` is a data: URI, then this function will return the original
+ * `url`.
+ *
+ * @param {string}  url
+ *                  the full URL, or a data: URI. from which the readable URL
+ *                  will be parsed, such as, http://example.org/a/b/c.js,
+ *                  http://xn--g6w.xn--8pv/%E8%A9%A6/%E6%B8%AC.js
+ * @return {string} The readable URL. It may be the same as the `url` passed to
+ *                  this function if the `url` itself is readable.
+ */
+function getUnicodeUrl(url) {
+  try {
+    const { protocol, hostname } = new URL(url);
+    if (protocol === "data:") {
+      // Never convert a data: URI.
+      return url;
+    }
+    const readableHostname = getUnicodeHostname(hostname);
+    url = decodeURIComponent(url);
+    return url.replace(hostname, readableHostname);
+  } catch (err) {
+    dump("Warning: getUnicodeUrl failed to get a Unicode URL from" +
+            `${url}, reason: ${err}`);
+  }
+  return url;
+}
+
+module.exports = {
+  getUnicodeHostname,
+  getUnicodeUrlPath,
+  getUnicodeUrl,
+};
diff --git a/devtools/client/shared/webpack/shims/unicode-url-stub.js b/devtools/client/shared/webpack/shims/unicode-url-stub.js
new file mode 100644
index 000000000000..0ae4cde77542
--- /dev/null
+++ b/devtools/client/shared/webpack/shims/unicode-url-stub.js
@@ -0,0 +1,32 @@
+/* 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/. */
+
+// TODO This file aims to implement a Chrome-API-free replacement for
+// devtools/client/shared/unicode-url.js, so that it can be used in the
+// Launchpad.
+//
+// Currently this is just a dummpy mock of
+// devtools/client/shared/unicode-url.js, no actual functionaly involved.
+// Eventually we'll want to implement it. Once implemented, we should keep the
+// feature the same as devtools/client/shared/unicode-url.js.
+
+"use strict";
+
+function getUnicodeHostname(hostname) {
+  return hostname;
+}
+
+function getUnicodeUrlPath(urlPath) {
+  return urlPath;
+}
+
+function getUnicodeUrl(url) {
+  return url;
+}
+
+module.exports = {
+  getUnicodeHostname,
+  getUnicodeUrlPath,
+  getUnicodeUrl,
+};
diff --git a/devtools/client/sourceeditor/test/head.js b/devtools/client/sourceeditor/test/head.js
index 0e60e6d3f3e1..207253924cf6 100644
--- a/devtools/client/sourceeditor/test/head.js
+++ b/devtools/client/sourceeditor/test/head.js
@@ -16,11 +16,6 @@ const { NetUtil } = require("resource://gre/modules/NetUtil.jsm");
 const Editor = require("devtools/client/sourceeditor/editor");
 const {getClientCssProperties} = require("devtools/shared/fronts/css-properties");
 
-flags.testing = true;
-SimpleTest.registerCleanupFunction(() => {
-  flags.testing = false;
-});
-
 function promiseWaitForFocus() {
   return new Promise(resolve =>
     waitForFocus(resolve));
diff --git a/devtools/client/storage/ui.js b/devtools/client/storage/ui.js
index 1ad4faae4b31..3e5e706138cc 100644
--- a/devtools/client/storage/ui.js
+++ b/devtools/client/storage/ui.js
@@ -10,6 +10,7 @@ const {LocalizationHelper, ELLIPSIS} = require("devtools/shared/l10n");
 const KeyShortcuts = require("devtools/client/shared/key-shortcuts");
 const JSOL = require("devtools/client/shared/vendor/jsol");
 const {KeyCodes} = require("devtools/client/shared/keycodes");
+const { getUnicodeHostname } = require("devtools/client/shared/unicode-url");
 
 // GUID to be used as a separator in compound keys. This must match the same
 // constant in devtools/server/actors/storage.js,
@@ -455,7 +456,8 @@ class StorageUI {
   async handleAddedItems(added) {
     for (let type in added) {
       for (let host in added[type]) {
-        this.tree.add([type, {id: host, type: "url"}]);
+        const label = this.getReadableLabelFromHostname(host);
+        this.tree.add([type, {id: host, label: label, type: "url"}]);
         for (let name of added[type][host]) {
           try {
             name = JSON.parse(name);
@@ -672,7 +674,8 @@ class StorageUI {
       }
       this.storageTypes[type] = storageTypes[type];
       for (let host in storageTypes[type].hosts) {
-        this.tree.add([type, {id: host, type: "url"}]);
+        const label = this.getReadableLabelFromHostname(host);
+        this.tree.add([type, {id: host, label: label, type: "url"}]);
         for (let name of storageTypes[type].hosts[host]) {
           try {
             let names = JSON.parse(name);
@@ -772,6 +775,35 @@ class StorageUI {
     this.emit("sidebar-updated");
   }
 
+  /**
+   * Gets a readable label from the hostname. If the hostname is a Punycode
+   * domain(I.e. an ASCII domain name representing a Unicode domain name), then
+   * this function decodes it to the readable Unicode domain name, and label
+   * the Unicode domain name toggether with the original domian name, and then
+   * return the label; if the hostname isn't a Punycode domain(I.e. it isn't
+   * encoded and is readable on its own), then this function simply returns the
+   * original hostname.
+   *
+   * @param {string} host
+   *        The string representing a host, e.g, example.com, example.com:8000
+   */
+  getReadableLabelFromHostname(host) {
+    try {
+      const { hostname } = new URL(host);
+      const unicodeHostname = getUnicodeHostname(hostname);
+      if (hostname !== unicodeHostname) {
+        // If the hostname is a Punycode domain representing a Unicode domain,
+        // we decode it to the Unicode domain name, and then label the Unicode
+        // domain name together with the original domain name.
+        return host.replace(hostname, unicodeHostname) + " [ " + host + " ]";
+      }
+    } catch (_) {
+      // Skip decoding for a host which doesn't include a domain name, simply
+      // consider them to be readable.
+    }
+    return host;
+  }
+
   /**
    * Tries to parse a string value into either a json or a key-value separated
    * object and populates the sidebar with the parsed value. The value can also
@@ -779,7 +811,7 @@ class StorageUI {
    *
    * @param {string} name
    *        The key corresponding to the `value` string in the object
-   * @param {string} value
+   * @param {string} originalValue
    *        The string to be parsed into an object
    */
   parseItemValue(name, originalValue) {
@@ -881,8 +913,6 @@ class StorageUI {
    * Select handler for the storage tree. Fetches details of the selected item
    * from the storage details and populates the storage tree.
    *
-   * @param {string} event
-   *        The name of the event fired
    * @param {array} item
    *        An array of ids which represent the location of the selected item in
    *        the storage tree
diff --git a/devtools/client/webaudioeditor/controller.js b/devtools/client/webaudioeditor/controller.js
index aed8635721cc..3f52f31e54fe 100644
--- a/devtools/client/webaudioeditor/controller.js
+++ b/devtools/client/webaudioeditor/controller.js
@@ -83,7 +83,7 @@ var WebAudioEditorController = {
   /**
    * Remove events emitted by the current tab target.
    */
-  destroy: function () {
+  destroy: function() {
     gTarget.off("will-navigate", this._onTabWillNavigate);
     gFront.off("start-context", this._onStartContext);
     gFront.off("create-node", this._onCreateNode);
@@ -100,7 +100,7 @@ var WebAudioEditorController = {
    * Called when page is reloaded to show the reload notice and waiting
    * for an audio context notice.
    */
-  reset: function () {
+  reset: function() {
     $("#content").hidden = true;
     ContextView.resetUI();
     InspectorView.resetUI();
@@ -110,7 +110,7 @@ var WebAudioEditorController = {
   // Since node events (create, disconnect, connect) are all async,
   // we have to make sure to wait that the node has finished creating
   // before performing an operation on it.
-  getNode: async function (nodeActor) {
+  getNode: async function(nodeActor) {
     let id = nodeActor.actorID;
     let node = gAudioNodes.get(id);
 
@@ -132,7 +132,7 @@ var WebAudioEditorController = {
    * so that the graph can update marker styling, as that
    * cannot currently be done with CSS.
    */
-  _onThemeChange: function () {
+  _onThemeChange: function() {
     let newValue = Services.prefs.getCharPref("devtools.theme");
     window.emit(EVENTS.THEME_CHANGE, newValue);
   },
@@ -167,7 +167,7 @@ var WebAudioEditorController = {
    * Called after the first audio node is created in an audio context,
    * signaling that the audio context is being used.
    */
-  _onStartContext: function () {
+  _onStartContext: function() {
     $("#reload-notice").hidden = true;
     $("#waiting-notice").hidden = true;
     $("#content").hidden = false;
@@ -178,7 +178,7 @@ var WebAudioEditorController = {
    * Called when a new node is created. Creates an `AudioNodeView` instance
    * for tracking throughout the editor.
    */
-  _onCreateNode: function (nodeActor) {
+  _onCreateNode: function(nodeActor) {
     gAudioNodes.add(nodeActor);
   },
 
@@ -186,7 +186,7 @@ var WebAudioEditorController = {
    * Called on `destroy-node` when an AudioNode is GC'd. Removes
    * from the AudioNode array and fires an event indicating the removal.
    */
-  _onDestroyNode: function (nodeActor) {
+  _onDestroyNode: function(nodeActor) {
     gAudioNodes.remove(gAudioNodes.get(nodeActor.actorID));
   },
 
diff --git a/devtools/client/webaudioeditor/includes.js b/devtools/client/webaudioeditor/includes.js
index bbbbf7e936f5..9e4586ae0c2e 100644
--- a/devtools/client/webaudioeditor/includes.js
+++ b/devtools/client/webaudioeditor/includes.js
@@ -84,8 +84,12 @@ EventEmitter.decorate(this);
 /**
  * DOM query helper.
  */
-function $(selector, target = document) { return target.querySelector(selector); }
-function $$(selector, target = document) { return target.querySelectorAll(selector); }
+function $(selector, target = document) {
+  return target.querySelector(selector);
+}
+function $$(selector, target = document) {
+  return target.querySelectorAll(selector);
+}
 
 /**
  * Takes an iterable collection, and a hash. Return the first
diff --git a/devtools/client/webaudioeditor/models.js b/devtools/client/webaudioeditor/models.js
index bc47187903f8..046b25e0d897 100644
--- a/devtools/client/webaudioeditor/models.js
+++ b/devtools/client/webaudioeditor/models.js
@@ -141,7 +141,6 @@ class AudioNodeModel extends EventEmitter {
   }
 }
 
-
 /**
  * Constructor for a Collection of `AudioNodeModel` models.
  *
@@ -181,6 +180,7 @@ class AudioNodesCollection extends EventEmitter {
    * @return AudioNodeModel
    */
   add(obj) {
+    // eslint-disable-next-line new-cap
     let node = new this.model(obj);
     node.collection = this;
 
diff --git a/devtools/client/webaudioeditor/panel.js b/devtools/client/webaudioeditor/panel.js
index 53ed0a623563..5f1f6d9f5fb7 100644
--- a/devtools/client/webaudioeditor/panel.js
+++ b/devtools/client/webaudioeditor/panel.js
@@ -20,7 +20,7 @@ function WebAudioEditorPanel(iframeWindow, toolbox) {
 exports.WebAudioEditorPanel = WebAudioEditorPanel;
 
 WebAudioEditorPanel.prototype = {
-  open: function () {
+  open: function() {
     let targetPromise;
 
     // Local debugging needs to make the target remote.
@@ -55,7 +55,7 @@ WebAudioEditorPanel.prototype = {
     return this._toolbox.target;
   },
 
-  destroy: function () {
+  destroy: function() {
     // Make sure this panel is not already destroyed.
     if (this._destroyer) {
       return this._destroyer;
diff --git a/devtools/client/webaudioeditor/test/browser_audionode-actor-add-automation-event.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-add-automation-event.js
index f7e2309e8175..1e162c126a07 100644
--- a/devtools/client/webaudioeditor/test/browser_audionode-actor-add-automation-event.js
+++ b/devtools/client/webaudioeditor/test/browser_audionode-actor-add-automation-event.js
@@ -5,7 +5,7 @@
  * Test AudioNode#addAutomationEvent();
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, front } = await initBackend(SIMPLE_CONTEXT_URL);
   let [_, [destNode, oscNode, gainNode]] = await Promise.all([
     front.setup({ reload: true }),
diff --git a/devtools/client/webaudioeditor/test/browser_audionode-actor-bypass.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-bypass.js
index 008e3bb80e87..52fbb52104d4 100644
--- a/devtools/client/webaudioeditor/test/browser_audionode-actor-bypass.js
+++ b/devtools/client/webaudioeditor/test/browser_audionode-actor-bypass.js
@@ -5,7 +5,7 @@
  * Test AudioNode#bypass(), AudioNode#isBypassed()
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, front } = await initBackend(SIMPLE_CONTEXT_URL);
   let [_, [destNode, oscNode, gainNode]] = await Promise.all([
     front.setup({ reload: true }),
diff --git a/devtools/client/webaudioeditor/test/browser_audionode-actor-bypassable.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-bypassable.js
index 40ff60e33897..cc233b8b52fc 100644
--- a/devtools/client/webaudioeditor/test/browser_audionode-actor-bypassable.js
+++ b/devtools/client/webaudioeditor/test/browser_audionode-actor-bypassable.js
@@ -5,7 +5,7 @@
  * Test AudioNode#bypassable
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, front } = await initBackend(SIMPLE_NODES_URL);
   let [_, nodes] = await Promise.all([
     front.setup({ reload: true }),
diff --git a/devtools/client/webaudioeditor/test/browser_audionode-actor-connectnode-disconnect.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-connectnode-disconnect.js
index 94426813a6ba..3cda7424f38c 100644
--- a/devtools/client/webaudioeditor/test/browser_audionode-actor-connectnode-disconnect.js
+++ b/devtools/client/webaudioeditor/test/browser_audionode-actor-connectnode-disconnect.js
@@ -6,7 +6,7 @@
  * Uses the editor front as the actors do not retain connect state.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, gAudioNodes } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_audionode-actor-connectparam.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-connectparam.js
index 54c9b840e864..413b57e3a35d 100644
--- a/devtools/client/webaudioeditor/test/browser_audionode-actor-connectparam.js
+++ b/devtools/client/webaudioeditor/test/browser_audionode-actor-connectparam.js
@@ -6,7 +6,7 @@
  * Uses the editor front as the actors do not retain connect state.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, gAudioNodes } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-01.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-01.js
index de5526d23efe..a7f3c521db67 100644
--- a/devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-01.js
+++ b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-01.js
@@ -6,7 +6,7 @@
  * a curve as the last event to check duration spread.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, front } = await initBackend(SIMPLE_CONTEXT_URL);
   let [_, [destNode, oscNode, gainNode]] = await Promise.all([
     front.setup({ reload: true }),
diff --git a/devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-02.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-02.js
index 0d35b463f355..1888dd9289a3 100644
--- a/devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-02.js
+++ b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-02.js
@@ -6,7 +6,7 @@
  * `setTargetAtTime`, which approaches its target to infinity.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, front } = await initBackend(SIMPLE_CONTEXT_URL);
   let [_, [destNode, oscNode, gainNode]] = await Promise.all([
     front.setup({ reload: true }),
diff --git a/devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-03.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-03.js
index c7505385b988..2196079c3e95 100644
--- a/devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-03.js
+++ b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-03.js
@@ -6,7 +6,7 @@
  * its argument.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, front } = await initBackend(SIMPLE_CONTEXT_URL);
   let [_, [destNode, oscNode, gainNode]] = await Promise.all([
     front.setup({ reload: true }),
diff --git a/devtools/client/webaudioeditor/test/browser_audionode-actor-get-param-flags.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-param-flags.js
index fba642de0793..6cf726382bc3 100644
--- a/devtools/client/webaudioeditor/test/browser_audionode-actor-get-param-flags.js
+++ b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-param-flags.js
@@ -5,7 +5,7 @@
  * Test AudioNode#getParamFlags()
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, front } = await initBackend(SIMPLE_NODES_URL);
   let [_, nodes] = await Promise.all([
     front.setup({ reload: true }),
@@ -33,12 +33,10 @@ add_task(async function () {
 
       if (param === "buffer") {
         is(flags.Buffer, true, "`buffer` params have Buffer flag");
-      }
-      else if (param === "bufferSize" || param === "frequencyBinCount") {
+      } else if (param === "bufferSize" || param === "frequencyBinCount") {
         is(flags.readonly, true, param + " is readonly");
-      }
-      else if (param === "curve") {
-        is(flags["Float32Array"], true, "`curve` param has Float32Array flag");
+      } else if (param === "curve") {
+        is(flags.Float32Array, true, "`curve` param has Float32Array flag");
       }
     }
   }
diff --git a/devtools/client/webaudioeditor/test/browser_audionode-actor-get-params-01.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-params-01.js
index f0586a4d970b..1af632ffefa9 100644
--- a/devtools/client/webaudioeditor/test/browser_audionode-actor-get-params-01.js
+++ b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-params-01.js
@@ -5,7 +5,7 @@
  * Test AudioNode#getParams()
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, front } = await initBackend(SIMPLE_NODES_URL);
   let [_, nodes] = await Promise.all([
     front.setup({ reload: true }),
@@ -35,12 +35,10 @@ add_task(async function () {
 
       if (param === "buffer") {
         is(flags.Buffer, true, "`buffer` params have Buffer flag");
-      }
-      else if (param === "bufferSize" || param === "frequencyBinCount") {
+      } else if (param === "bufferSize" || param === "frequencyBinCount") {
         is(flags.readonly, true, param + " is readonly");
-      }
-      else if (param === "curve") {
-        is(flags["Float32Array"], true, "`curve` param has Float32Array flag");
+      } else if (param === "curve") {
+        is(flags.Float32Array, true, "`curve` param has Float32Array flag");
       }
     });
   });
diff --git a/devtools/client/webaudioeditor/test/browser_audionode-actor-get-params-02.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-params-02.js
index 4ee7c11087f8..65f497b8b0cf 100644
--- a/devtools/client/webaudioeditor/test/browser_audionode-actor-get-params-02.js
+++ b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-params-02.js
@@ -6,7 +6,7 @@
  * from the AudioNode actors.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, front } = await initBackend(SIMPLE_NODES_URL);
   let [_, nodes] = await Promise.all([
     front.setup({ reload: true }),
@@ -39,8 +39,7 @@ function compare(actual, expected, type) {
     value = getGripValue(value);
     if (typeof expected[param] === "function") {
       ok(expected[param](value), type + " has a passing value for " + param);
-    }
-    else {
+    } else {
       is(value, expected[param], type + " has correct default value and type for " + param);
     }
   });
diff --git a/devtools/client/webaudioeditor/test/browser_audionode-actor-get-set-param.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-set-param.js
index 4702a92c7bb7..0b6eda51ab61 100644
--- a/devtools/client/webaudioeditor/test/browser_audionode-actor-get-set-param.js
+++ b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-set-param.js
@@ -5,7 +5,7 @@
  * Test AudioNode#getParam() / AudioNode#setParam()
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, front } = await initBackend(SIMPLE_CONTEXT_URL);
   let [_, [destNode, oscNode, gainNode]] = await Promise.all([
     front.setup({ reload: true }),
diff --git a/devtools/client/webaudioeditor/test/browser_audionode-actor-source.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-source.js
index 6845f197fbbd..5d977c346a27 100644
--- a/devtools/client/webaudioeditor/test/browser_audionode-actor-source.js
+++ b/devtools/client/webaudioeditor/test/browser_audionode-actor-source.js
@@ -5,7 +5,7 @@
  * Test AudioNode#source
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, front } = await initBackend(SIMPLE_NODES_URL);
   let [_, nodes] = await Promise.all([
     front.setup({ reload: true }),
@@ -17,10 +17,11 @@ add_task(async function () {
 
   actualTypes.forEach((type, i) => {
     let shouldBeSource = type === "AudioBufferSourceNode" || type === "OscillatorNode";
-    if (shouldBeSource)
+    if (shouldBeSource) {
       is(isSourceResult[i], true, type + "'s `source` is `true`");
-    else
+    } else {
       is(isSourceResult[i], false, type + "'s `source` is `false`");
+    }
   });
 
   await removeTab(target.tab);
diff --git a/devtools/client/webaudioeditor/test/browser_audionode-actor-type.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-type.js
index 3f57a3ceff59..8049126b41af 100644
--- a/devtools/client/webaudioeditor/test/browser_audionode-actor-type.js
+++ b/devtools/client/webaudioeditor/test/browser_audionode-actor-type.js
@@ -5,7 +5,7 @@
  * Test AudioNode#type
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, front } = await initBackend(SIMPLE_NODES_URL);
   let [_, nodes] = await Promise.all([
     front.setup({ reload: true }),
diff --git a/devtools/client/webaudioeditor/test/browser_callwatcher-01.js b/devtools/client/webaudioeditor/test/browser_callwatcher-01.js
index ade42bd248c0..31be441ecee9 100644
--- a/devtools/client/webaudioeditor/test/browser_callwatcher-01.js
+++ b/devtools/client/webaudioeditor/test/browser_callwatcher-01.js
@@ -10,7 +10,7 @@
 
 const BUG_1130901_URL = EXAMPLE_URL + "doc_bug_1130901.html";
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(BUG_1130901_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, gAudioNodes } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_callwatcher-02.js b/devtools/client/webaudioeditor/test/browser_callwatcher-02.js
index a89a04537ef7..278036a07e3b 100644
--- a/devtools/client/webaudioeditor/test/browser_callwatcher-02.js
+++ b/devtools/client/webaudioeditor/test/browser_callwatcher-02.js
@@ -9,7 +9,7 @@
 
 const BUG_1112378_URL = EXAMPLE_URL + "doc_bug_1112378.html";
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(BUG_1112378_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, gAudioNodes } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_automation-view-01.js b/devtools/client/webaudioeditor/test/browser_wa_automation-view-01.js
index 14e87cce5fa9..d302dd58db4f 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_automation-view-01.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_automation-view-01.js
@@ -6,7 +6,7 @@
  * or params exist.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(AUTOMATION_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_automation-view-02.js b/devtools/client/webaudioeditor/test/browser_wa_automation-view-02.js
index 61b709a40639..57b967eb149c 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_automation-view-02.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_automation-view-02.js
@@ -6,7 +6,7 @@
  * switching between AudioParam rerenders the graph.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(AUTOMATION_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, AutomationView } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_controller-01.js b/devtools/client/webaudioeditor/test/browser_wa_controller-01.js
index 0b04c894f058..bd9f7648d48a 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_controller-01.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_controller-01.js
@@ -9,7 +9,7 @@
 
 const BUG_1125817_URL = EXAMPLE_URL + "doc_bug_1125817.html";
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(BUG_1125817_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, gAudioNodes } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_destroy-node-01.js b/devtools/client/webaudioeditor/test/browser_wa_destroy-node-01.js
index 1a15a73f9708..853e9014fbec 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_destroy-node-01.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_destroy-node-01.js
@@ -9,7 +9,7 @@
  * All done in one test since this test takes a few seconds to clear GC.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(DESTROY_NODES_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, gAudioNodes } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_first-run.js b/devtools/client/webaudioeditor/test/browser_wa_first-run.js
index cdc169370eaf..913c4ab9f5a6 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_first-run.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_first-run.js
@@ -5,7 +5,7 @@
  * Tests that the reloading/onContentLoaded hooks work.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { gFront, $ } = panel.panelWin;
 
diff --git a/devtools/client/webaudioeditor/test/browser_wa_graph-click.js b/devtools/client/webaudioeditor/test/browser_wa_graph-click.js
index ad3cc3371dbe..40fbe61f5a2e 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_graph-click.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_graph-click.js
@@ -6,7 +6,7 @@
  * the correct node in the InspectorView
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(COMPLEX_CONTEXT_URL);
   let panelWin = panel.panelWin;
   let { gFront, $, $$, InspectorView } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_graph-markers.js b/devtools/client/webaudioeditor/test/browser_wa_graph-markers.js
index 3af4bc9d3087..7901cfadb40c 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_graph-markers.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_graph-markers.js
@@ -7,7 +7,7 @@
 
 const { setTheme } = require("devtools/client/shared/theme");
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, MARKER_STYLING } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_graph-render-01.js b/devtools/client/webaudioeditor/test/browser_wa_graph-render-01.js
index 2df2af698209..3fce10d68a18 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_graph-render-01.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_graph-render-01.js
@@ -7,7 +7,7 @@
 
 var connectCount = 0;
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, gAudioNodes } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_graph-render-02.js b/devtools/client/webaudioeditor/test/browser_wa_graph-render-02.js
index 6d39300495b8..6814768f4c75 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_graph-render-02.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_graph-render-02.js
@@ -5,7 +5,7 @@
  * Tests more edge rendering for complex graphs.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(COMPLEX_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, $$ } = panelWin;
@@ -23,7 +23,6 @@ add_task(async function () {
   let types = ["AudioDestinationNode", "OscillatorNode", "GainNode", "ScriptProcessorNode",
                "OscillatorNode", "GainNode", "AudioBufferSourceNode", "BiquadFilterNode"];
 
-
   types.forEach((type, i) => {
     ok(findGraphNode(panelWin, nodeIDs[i]).classList.contains("type-" + type), "found " + type + " with class");
   });
diff --git a/devtools/client/webaudioeditor/test/browser_wa_graph-render-03.js b/devtools/client/webaudioeditor/test/browser_wa_graph-render-03.js
index 07a63a836bc2..9534f5278833 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_graph-render-03.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_graph-render-03.js
@@ -5,7 +5,7 @@
  * Tests to ensure that selected nodes stay selected on graph redraw.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_graph-render-04.js b/devtools/client/webaudioeditor/test/browser_wa_graph-render-04.js
index 9643cb1c7c7f..c9675864e542 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_graph-render-04.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_graph-render-04.js
@@ -5,7 +5,7 @@
  * Tests audio param connection rendering.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(CONNECT_MULTI_PARAM_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_graph-render-05.js b/devtools/client/webaudioeditor/test/browser_wa_graph-render-05.js
index 5330bc8b3fb2..d09fcdd9b9ca 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_graph-render-05.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_graph-render-05.js
@@ -5,7 +5,7 @@
  * Tests to ensure that param connections trigger graph redraws
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_graph-render-06.js b/devtools/client/webaudioeditor/test/browser_wa_graph-render-06.js
index 24fb4cf514c3..c239c8078179 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_graph-render-06.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_graph-render-06.js
@@ -7,7 +7,7 @@
 
 const BUG_1141261_URL = EXAMPLE_URL + "doc_bug_1141261.html";
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(BUG_1141261_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_graph-selected.js b/devtools/client/webaudioeditor/test/browser_wa_graph-selected.js
index f623caf42623..5debf04c259c 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_graph-selected.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_graph-selected.js
@@ -5,7 +5,7 @@
  * Tests that SVG nodes and edges were created for the Graph View.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_graph-zoom.js b/devtools/client/webaudioeditor/test/browser_wa_graph-zoom.js
index 554465412601..75adc773abd8 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_graph-zoom.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_graph-zoom.js
@@ -5,7 +5,7 @@
  * Tests that the graph's scale and position is reset on a page reload.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, ContextView } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_inspector-bypass-01.js b/devtools/client/webaudioeditor/test/browser_wa_inspector-bypass-01.js
index 92c2e773788e..69fd684330d7 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_inspector-bypass-01.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_inspector-bypass-01.js
@@ -5,7 +5,7 @@
  * Tests that nodes are correctly bypassed when bypassing.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, gAudioNodes } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_inspector-toggle.js b/devtools/client/webaudioeditor/test/browser_wa_inspector-toggle.js
index 935ed271b873..f8d94fce1867 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_inspector-toggle.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_inspector-toggle.js
@@ -6,7 +6,7 @@
  * the inspector panel as intended.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, InspectorView } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_inspector-width.js b/devtools/client/webaudioeditor/test/browser_wa_inspector-width.js
index 4d7ceae97a90..8d27c96beb6a 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_inspector-width.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_inspector-width.js
@@ -6,7 +6,7 @@
  * a preference
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, InspectorView } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_inspector.js b/devtools/client/webaudioeditor/test/browser_wa_inspector.js
index 56b231489d64..a18f68b3bae1 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_inspector.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_inspector.js
@@ -6,7 +6,7 @@
  * loads the correct node inside the inspector.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, InspectorView } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_navigate.js b/devtools/client/webaudioeditor/test/browser_wa_navigate.js
index 977415050b7f..7a4f2bb7993f 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_navigate.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_navigate.js
@@ -6,7 +6,7 @@
  * the audio graph if both pages have an AudioContext.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $ } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_properties-view-edit-01.js b/devtools/client/webaudioeditor/test/browser_wa_properties-view-edit-01.js
index 46b722a75148..ad635e8ae7bc 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_properties-view-edit-01.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_properties-view-edit-01.js
@@ -5,7 +5,7 @@
  * Tests that properties are updated when modifying the VariablesView.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, PropertiesView } = panelWin;
@@ -37,17 +37,17 @@ add_task(async function () {
   }, "default loaded string");
 
   click(panelWin, findGraphNode(panelWin, nodeIds[2]));
-  await waitForInspectorRender(panelWin, EVENTS),
+  await waitForInspectorRender(panelWin, EVENTS);
   checkVariableView(gVars, 0, {
     "gain": 0
   }, "default loaded number");
 
   click(panelWin, findGraphNode(panelWin, nodeIds[1]));
-  await waitForInspectorRender(panelWin, EVENTS),
+  await waitForInspectorRender(panelWin, EVENTS);
   await setAndCheck(0, "type", "square", "square", "sets string as string");
 
   click(panelWin, findGraphNode(panelWin, nodeIds[2]));
-  await waitForInspectorRender(panelWin, EVENTS),
+  await waitForInspectorRender(panelWin, EVENTS);
   await setAndCheck(0, "gain", "0.005", 0.005, "sets number as number");
   await setAndCheck(0, "gain", "0.1", 0.1, "sets float as float");
   await setAndCheck(0, "gain", ".2", 0.2, "sets float without leading zero as float");
@@ -56,7 +56,7 @@ add_task(async function () {
 });
 
 function setAndCheckVariable(panelWin, gVars) {
-  return async function (varNum, prop, value, expected, desc) {
+  return async function(varNum, prop, value, expected, desc) {
     await modifyVariableView(panelWin, gVars, varNum, prop, value);
     var props = {};
     props[prop] = expected;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_properties-view-edit-02.js b/devtools/client/webaudioeditor/test/browser_wa_properties-view-edit-02.js
index 6f89e4329ec6..14d3fc61abdd 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_properties-view-edit-02.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_properties-view-edit-02.js
@@ -5,7 +5,7 @@
  * Tests that properties are not updated when modifying the VariablesView.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(COMPLEX_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, PropertiesView } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_properties-view-media-nodes.js b/devtools/client/webaudioeditor/test/browser_wa_properties-view-media-nodes.js
index de3f448f603f..cb5576d4b148 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_properties-view-media-nodes.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_properties-view-media-nodes.js
@@ -15,8 +15,9 @@ function waitForDeviceClosed() {
   ChromeUtils.import("resource:///modules/webrtcUI.jsm", temp);
   let webrtcUI = temp.webrtcUI;
 
-  if (!webrtcUI.showGlobalIndicator)
+  if (!webrtcUI.showGlobalIndicator) {
     return Promise.resolve();
+  }
 
   return new Promise((resolve, reject) => {
     const message = "webrtc:UpdateGlobalIndicators";
@@ -30,7 +31,7 @@ function waitForDeviceClosed() {
   });
 }
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(MEDIA_NODES_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, PropertiesView } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_properties-view-params-objects.js b/devtools/client/webaudioeditor/test/browser_wa_properties-view-params-objects.js
index 1ca036088bea..b12207c1782f 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_properties-view-params-objects.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_properties-view-params-objects.js
@@ -6,7 +6,7 @@
  * like AudioBuffer and Float32Array in properties of AudioNodes.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(BUFFER_AND_ARRAY_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, PropertiesView } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_properties-view-params.js b/devtools/client/webaudioeditor/test/browser_wa_properties-view-params.js
index 85dde6c1dc60..77725d8ea59b 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_properties-view-params.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_properties-view-params.js
@@ -6,7 +6,7 @@
  * correctly, with default values and correct types.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_NODES_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, PropertiesView } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_properties-view.js b/devtools/client/webaudioeditor/test/browser_wa_properties-view.js
index 64a0940bdbfd..e7774de09aae 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_properties-view.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_properties-view.js
@@ -5,7 +5,7 @@
  * Tests that params view shows params when they exist, and are hidden otherwise.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, $$, EVENTS, PropertiesView } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_reset-01.js b/devtools/client/webaudioeditor/test/browser_wa_reset-01.js
index 46fde7c893e1..182e7b087dfe 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_reset-01.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_reset-01.js
@@ -6,7 +6,7 @@
  * event and reshow the tools after reloading.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { gFront, $ } = panel.panelWin;
 
diff --git a/devtools/client/webaudioeditor/test/browser_wa_reset-02.js b/devtools/client/webaudioeditor/test/browser_wa_reset-02.js
index bcf0d1c5d9b8..cf85976e0ee4 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_reset-02.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_reset-02.js
@@ -6,7 +6,7 @@
  * the graph.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $ } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_reset-03.js b/devtools/client/webaudioeditor/test/browser_wa_reset-03.js
index fd391e81495a..ef0397e66121 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_reset-03.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_reset-03.js
@@ -6,7 +6,7 @@
  * the inspector and selected node.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, panel } = await initWebAudioEditor(SIMPLE_CONTEXT_URL);
   let { panelWin } = panel;
   let { gFront, $, InspectorView } = panelWin;
diff --git a/devtools/client/webaudioeditor/test/browser_wa_reset-04.js b/devtools/client/webaudioeditor/test/browser_wa_reset-04.js
index 8f12c3bf6140..6c35495b1bd1 100644
--- a/devtools/client/webaudioeditor/test/browser_wa_reset-04.js
+++ b/devtools/client/webaudioeditor/test/browser_wa_reset-04.js
@@ -5,7 +5,7 @@
  * Tests that switching to an iframe works fine.
  */
 
-add_task(async function () {
+add_task(async function() {
   Services.prefs.setBoolPref("devtools.command-button-frames.enabled", true);
 
   let { target, panel, toolbox } = await initWebAudioEditor(IFRAME_CONTEXT_URL);
diff --git a/devtools/client/webaudioeditor/test/browser_webaudio-actor-automation-event.js b/devtools/client/webaudioeditor/test/browser_webaudio-actor-automation-event.js
index b5caa641ebc4..f5809b190417 100644
--- a/devtools/client/webaudioeditor/test/browser_webaudio-actor-automation-event.js
+++ b/devtools/client/webaudioeditor/test/browser_webaudio-actor-automation-event.js
@@ -6,7 +6,7 @@
  * with correct arguments from the content.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, front } = await initBackend(AUTOMATION_URL);
   let events = [];
 
diff --git a/devtools/client/webaudioeditor/test/browser_webaudio-actor-connect-param.js b/devtools/client/webaudioeditor/test/browser_webaudio-actor-connect-param.js
index d3abd90ceac5..0f4cae2903d0 100644
--- a/devtools/client/webaudioeditor/test/browser_webaudio-actor-connect-param.js
+++ b/devtools/client/webaudioeditor/test/browser_webaudio-actor-connect-param.js
@@ -5,7 +5,7 @@
  * Test the `connect-param` event on the web audio actor.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, front } = await initBackend(CONNECT_PARAM_URL);
   let [, , [destNode, carrierNode, modNode, gainNode], , connectParam] = await Promise.all([
     front.setup({ reload: true }),
diff --git a/devtools/client/webaudioeditor/test/browser_webaudio-actor-destroy-node.js b/devtools/client/webaudioeditor/test/browser_webaudio-actor-destroy-node.js
index 291b50ac9084..644e7747e222 100644
--- a/devtools/client/webaudioeditor/test/browser_webaudio-actor-destroy-node.js
+++ b/devtools/client/webaudioeditor/test/browser_webaudio-actor-destroy-node.js
@@ -5,7 +5,7 @@
  * Test `destroy-node` event on WebAudioActor.
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, front } = await initBackend(DESTROY_NODES_URL);
 
   let [, , created] = await Promise.all([
@@ -34,8 +34,9 @@ add_task(async function () {
 
 function actorIsInList(list, actor) {
   for (let i = 0; i < list.length; i++) {
-    if (list[i].actorID === actor.actorID)
+    if (list[i].actorID === actor.actorID) {
       return list[i];
+    }
   }
   return null;
 }
diff --git a/devtools/client/webaudioeditor/test/browser_webaudio-actor-simple.js b/devtools/client/webaudioeditor/test/browser_webaudio-actor-simple.js
index 764aa3477a81..8e17d250c4f6 100644
--- a/devtools/client/webaudioeditor/test/browser_webaudio-actor-simple.js
+++ b/devtools/client/webaudioeditor/test/browser_webaudio-actor-simple.js
@@ -5,7 +5,7 @@
  * Test basic communication of Web Audio actor
  */
 
-add_task(async function () {
+add_task(async function() {
   let { target, front } = await initBackend(SIMPLE_CONTEXT_URL);
   let [_, __, [destNode, oscNode, gainNode], [connect1, connect2]] = await Promise.all([
     front.setup({ reload: true }),
diff --git a/devtools/client/webaudioeditor/test/doc_buffer-and-array.html b/devtools/client/webaudioeditor/test/doc_buffer-and-array.html
index 9f85222672bb..8b8897806c03 100644
--- a/devtools/client/webaudioeditor/test/doc_buffer-and-array.html
+++ b/devtools/client/webaudioeditor/test/doc_buffer-and-array.html
@@ -42,7 +42,7 @@
         return curve;
       }
 
-      function getBuffer (url, callback) {
+      function getBuffer(url, callback) {
         let xhr = new XMLHttpRequest();
         xhr.open("GET", url, true);
         xhr.responseType = "arraybuffer";
diff --git a/devtools/client/webaudioeditor/test/doc_bug_1112378.html b/devtools/client/webaudioeditor/test/doc_bug_1112378.html
index 42ca3a38ea3e..7081918d5161 100644
--- a/devtools/client/webaudioeditor/test/doc_bug_1112378.html
+++ b/devtools/client/webaudioeditor/test/doc_bug_1112378.html
@@ -16,7 +16,7 @@
       let ctx = new AudioContext();
       let osc = ctx.createOscillator();
 
-      function throwError () {
+      function throwError() {
         try {
           osc.connect({});
         } catch (e) {
@@ -28,11 +28,11 @@
             instanceof: e instanceof TypeError,
             stringified: e.toString(),
             name: e.name
-          }
+          };
         }
       }
 
-      function throwDOMException () {
+      function throwDOMException() {
         try {
           osc.frequency.setValueAtTime(0, -1);
         } catch (e) {
@@ -46,11 +46,10 @@
             instanceof: e instanceof DOMException,
             stringified: e.toString(),
             name: e.name
-          }
+          };
         }
       }
 
-
     </script>
   </body>
 
diff --git a/devtools/client/webaudioeditor/test/doc_destroy-nodes.html b/devtools/client/webaudioeditor/test/doc_destroy-nodes.html
index edb5bf6e93b7..6b1d4b9466d2 100644
--- a/devtools/client/webaudioeditor/test/doc_destroy-nodes.html
+++ b/devtools/client/webaudioeditor/test/doc_destroy-nodes.html
@@ -16,19 +16,19 @@
       // be collected. We will zero this reference by force from the devtools
       // side.
       var keepAlive = [];
-      (function () {
-      let ctx = new AudioContext();
-      let osc = ctx.createOscillator();
-      let gain = ctx.createGain();
+      (function() {
+        let ctx = new AudioContext();
+        let osc = ctx.createOscillator();
+        let gain = ctx.createGain();
 
-      for (let i = 0; i < 10; i++) {
-        keepAlive.push(ctx.createBufferSource());
-      }
+        for (let i = 0; i < 10; i++) {
+          keepAlive.push(ctx.createBufferSource());
+        }
 
-      osc.connect(gain);
-      gain.connect(ctx.destination);
-      gain.gain.value = 0;
-      osc.start();
+        osc.connect(gain);
+        gain.connect(ctx.destination);
+        gain.gain.value = 0;
+        osc.start();
       })();
     </script>
   </body>
diff --git a/devtools/client/webaudioeditor/test/head.js b/devtools/client/webaudioeditor/test/head.js
index c0b3a4e431e2..179bbb227733 100644
--- a/devtools/client/webaudioeditor/test/head.js
+++ b/devtools/client/webaudioeditor/test/head.js
@@ -62,7 +62,7 @@ function initBackend(aUrl) {
   DebuggerServer.init();
   DebuggerServer.registerAllActors();
 
-  return (async function () {
+  return (async function() {
     let tab = await addTab(aUrl);
     let target = TargetFactory.forTab(tab);
 
@@ -81,7 +81,7 @@ function initBackend(aUrl) {
 function initWebAudioEditor(aUrl) {
   info("Initializing a web audio editor pane.");
 
-  return (async function () {
+  return (async function() {
     let tab = await addTab(aUrl);
     let target = TargetFactory.forTab(tab);
 
@@ -118,7 +118,7 @@ function getN(front, eventName, count, spread) {
   let actors = [];
   info(`Waiting for ${count} ${eventName} events`);
 
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     front.on(eventName, function onEvent(...args) {
       let actor = args[0];
       if (actors.length !== count) {
@@ -133,13 +133,27 @@ function getN(front, eventName, count, spread) {
   });
 }
 
-function get(front, eventName) { return getN(front, eventName, 1); }
-function get2(front, eventName) { return getN(front, eventName, 2); }
-function get3(front, eventName) { return getN(front, eventName, 3); }
-function getSpread(front, eventName) { return getN(front, eventName, 1, true); }
-function get2Spread(front, eventName) { return getN(front, eventName, 2, true); }
-function get3Spread(front, eventName) { return getN(front, eventName, 3, true); }
-function getNSpread(front, eventName, count) { return getN(front, eventName, count, true); }
+function get(front, eventName) {
+  return getN(front, eventName, 1);
+}
+function get2(front, eventName) {
+  return getN(front, eventName, 2);
+}
+function get3(front, eventName) {
+  return getN(front, eventName, 3);
+}
+function getSpread(front, eventName) {
+  return getN(front, eventName, 1, true);
+}
+function get2Spread(front, eventName) {
+  return getN(front, eventName, 2, true);
+}
+function get3Spread(front, eventName) {
+  return getN(front, eventName, 3, true);
+}
+function getNSpread(front, eventName, count) {
+  return getN(front, eventName, count, true);
+}
 
 /**
  * Waits for the UI_GRAPH_RENDERED event to fire, but only
@@ -150,7 +164,7 @@ function waitForGraphRendered(front, nodeCount, edgeCount, paramEdgeCount) {
   let eventName = front.EVENTS.UI_GRAPH_RENDERED;
   info(`Wait for graph rendered with ${nodeCount} nodes, ${edgeCount} edges`);
 
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     front.on(eventName, function onGraphRendered(nodes, edges, pEdges) {
       let paramEdgesDone = paramEdgeCount != null ? paramEdgeCount === pEdges : true;
       info(`Got graph rendered with ${nodes} / ${nodeCount} nodes, ` +
@@ -188,13 +202,11 @@ function checkVariableView(view, index, hash, description = "") {
     // and "Float32Array", but will match the original value.
     try {
       value = JSON.parse(value);
-    }
-    catch (e) {}
+    } catch (e) {}
     if (typeof hash[variable] === "function") {
       ok(hash[variable](value),
         "Passing property value of " + value + " for " + variable + " " + description);
-    }
-    else {
+    } else {
       is(value, hash[variable],
         "Correct property value of " + hash[variable] + " for " + variable + " " + description);
     }
@@ -210,12 +222,12 @@ function modifyVariableView(win, view, index, prop, value) {
     const onParamSetSuccess = () => {
       win.off(win.EVENTS.UI_SET_PARAM_ERROR, onParamSetError);
       resolve();
-    }
+    };
 
     const onParamSetError = () => {
       win.off(win.EVENTS.UI_SET_PARAM, onParamSetSuccess);
       reject();
-    }
+    };
     win.once(win.EVENTS.UI_SET_PARAM, onParamSetSuccess);
     win.once(win.EVENTS.UI_SET_PARAM_ERROR, onParamSetError);
 
@@ -325,7 +337,7 @@ function countGraphObjects(win) {
 * Forces cycle collection and GC, used in AudioNode destruction tests.
 */
 function forceNodeCollection() {
-  ContentTask.spawn(gBrowser.selectedBrowser, {}, async function () {
+  ContentTask.spawn(gBrowser.selectedBrowser, {}, async function() {
     // Kill the reference keeping stuff alive.
     content.wrappedJSObject.keepAlive = null;
 
@@ -384,7 +396,9 @@ function waitForInspectorRender(panelWin, EVENTS) {
 function nodeDefaultValues(nodeName) {
   let fn = NODE_CONSTRUCTORS[nodeName];
 
-  if (typeof fn === "undefined") return {};
+  if (typeof fn === "undefined") {
+    return {};
+  }
 
   let init = nodeName === "AudioDestinationNode" ? "destination" : `create${fn}()`;
 
diff --git a/devtools/client/webaudioeditor/views/automation.js b/devtools/client/webaudioeditor/views/automation.js
index 16abf5ca7a23..9de6e1a08970 100644
--- a/devtools/client/webaudioeditor/views/automation.js
+++ b/devtools/client/webaudioeditor/views/automation.js
@@ -12,7 +12,7 @@ var AutomationView = {
   /**
    * Initialization function called when the tool starts up.
    */
-  initialize: function () {
+  initialize: function() {
     this._buttons = $("#automation-param-toolbar-buttons");
     this.graph = new LineGraphWidget($("#automation-graph"), { avg: false });
     this.graph.selectionEnabled = false;
@@ -29,7 +29,7 @@ var AutomationView = {
   /**
    * Destruction function called when the tool cleans up.
    */
-  destroy: function () {
+  destroy: function() {
     this._buttons.removeEventListener("click", this._onButtonClick);
     window.off(EVENTS.UI_INSPECTOR_RESIZE, this._onResize);
     window.off(EVENTS.UI_INSPECTOR_NODE_SET, this._onNodeSet);
@@ -38,7 +38,7 @@ var AutomationView = {
   /**
    * Empties out the props view.
    */
-  resetUI: function () {
+  resetUI: function() {
     this._currentNode = null;
   },
 
@@ -83,7 +83,7 @@ var AutomationView = {
    * Create the buttons for each AudioParam, that when clicked,
    * render the graph for that AudioParam.
    */
-  _createParamButtons: function (params) {
+  _createParamButtons: function(params) {
     this._buttons.innerHTML = "";
     params.forEach((param, i) => {
       let button = document.createElement("toolbarbutton");
@@ -105,7 +105,7 @@ var AutomationView = {
    * Internally sets the current audio node and rebuilds appropriate
    * views.
    */
-  _setAudioNode: function (node) {
+  _setAudioNode: function(node) {
     this._currentNode = node;
     if (this._currentNode) {
       this.build();
@@ -117,7 +117,7 @@ var AutomationView = {
    * the audio node has no AudioParams, no automation events, or
    * shows the graph.
    */
-  _setState: function (state) {
+  _setState: function(state) {
     let contentView = $("#automation-content");
     let emptyView = $("#automation-empty");
 
@@ -135,7 +135,7 @@ var AutomationView = {
    * Event handlers
    */
 
-  _onButtonClick: function (e) {
+  _onButtonClick: function(e) {
     Array.forEach($$(".automation-param-button"), $btn => $btn.removeAttribute("selected"));
     let paramName = e.target.getAttribute("data-param");
     e.target.setAttribute("selected", true);
@@ -146,14 +146,14 @@ var AutomationView = {
   /**
    * Called when the inspector is resized.
    */
-  _onResize: function () {
+  _onResize: function() {
     this.graph.refresh();
   },
 
   /**
    * Called when the inspector view determines a node is selected.
    */
-  _onNodeSet: function (id) {
+  _onNodeSet: function(id) {
     this._setAudioNode(id != null ? gAudioNodes.get(id) : null);
   }
 };
diff --git a/devtools/client/webaudioeditor/views/context.js b/devtools/client/webaudioeditor/views/context.js
index ac6bda7ea87e..fcc489bee3aa 100644
--- a/devtools/client/webaudioeditor/views/context.js
+++ b/devtools/client/webaudioeditor/views/context.js
@@ -43,7 +43,7 @@ var ContextView = {
   /**
    * Initialization function, called when the tool is started.
    */
-  initialize: function () {
+  initialize: function() {
     this._onGraphClick = this._onGraphClick.bind(this);
     this._onThemeChange = this._onThemeChange.bind(this);
     this._onStartContext = this._onStartContext.bind(this);
@@ -60,7 +60,7 @@ var ContextView = {
   /**
    * Destruction function, called when the tool is closed.
    */
-  destroy: function () {
+  destroy: function() {
     // If the graph was rendered at all, then the handler
     // for zooming in will be set. We must remove it to prevent leaks.
     if (this._zoomBinding) {
@@ -77,7 +77,7 @@ var ContextView = {
    * Called when a page is reloaded and waiting for a "start-context" event
    * and clears out old content
    */
-  resetUI: function () {
+  resetUI: function() {
     this.clearGraph();
     this.resetGraphTransform();
   },
@@ -86,14 +86,14 @@ var ContextView = {
    * Clears out the rendered graph, called when resetting the SVG elements to draw again,
    * or when resetting the entire UI tool
    */
-  clearGraph: function () {
+  clearGraph: function() {
     $("#graph-target").innerHTML = "";
   },
 
   /**
    * Moves the graph back to its original scale and translation.
    */
-  resetGraphTransform: function () {
+  resetGraphTransform: function() {
     // Only reset if the graph was ever drawn.
     if (this._zoomBinding) {
       let { translate, scale } = GRAPH_DEFAULTS;
@@ -106,11 +106,11 @@ var ContextView = {
     }
   },
 
-  getCurrentScale: function () {
+  getCurrentScale: function() {
     return this._zoomBinding ? this._zoomBinding.scale() : null;
   },
 
-  getCurrentTranslation: function () {
+  getCurrentTranslation: function() {
     return this._zoomBinding ? this._zoomBinding.translate() : null;
   },
 
@@ -119,7 +119,7 @@ var ContextView = {
    * focused styles from all other nodes. If no `actorID` specified,
    * make all nodes appear unselected.
    */
-  focusNode: function (actorID) {
+  focusNode: function(actorID) {
     // Remove class "selected" from all nodes
     Array.forEach($$(".nodes > g"), $node => $node.classList.remove("selected"));
     // Add to "selected"
@@ -131,7 +131,7 @@ var ContextView = {
   /**
    * Takes an actorID and returns the corresponding DOM SVG element in the graph
    */
-  _getNodeByID: function (actorID) {
+  _getNodeByID: function(actorID) {
     return $(".nodes > g[data-id='" + actorID + "']");
   },
 
@@ -139,7 +139,7 @@ var ContextView = {
    * Sets the appropriate class on an SVG node when its bypass
    * status is toggled.
    */
-  _bypassNode: function (node, enabled) {
+  _bypassNode: function(node, enabled) {
     let el = this._getNodeByID(node.id);
     el.classList[enabled ? "add" : "remove"]("bypassed");
   },
@@ -149,7 +149,7 @@ var ContextView = {
    * throttled to be called at most every `GRAPH_DEBOUNCE_TIMER` milliseconds.
    * It's called whenever the audio context routing changes, after being debounced.
    */
-  draw: function () {
+  draw: function() {
     // Clear out previous SVG information
     this.clearGraph();
 
@@ -159,9 +159,9 @@ var ContextView = {
 
     // Post-render manipulation of the nodes
     let oldDrawNodes = renderer.drawNodes();
-    renderer.drawNodes(function (graph, root) {
+    renderer.drawNodes(function(graph, root) {
       let svgNodes = oldDrawNodes(graph, root);
-      svgNodes.each(function (n) {
+      svgNodes.each(function(n) {
         let node = graph.node(n);
         let classString = "audionode type-" + node.type + (node.bypassed ? " bypassed" : "");
         this.setAttribute("class", classString);
@@ -175,9 +175,9 @@ var ContextView = {
     let oldDrawEdgePaths = renderer.drawEdgePaths();
     let defaultClasses = "edgePath enter";
 
-    renderer.drawEdgePaths(function (graph, root) {
+    renderer.drawEdgePaths(function(graph, root) {
       let svgEdges = oldDrawEdgePaths(graph, root);
-      svgEdges.each(function (e) {
+      svgEdges.each(function(e) {
         let edge = graph.edge(e);
 
         // We have to manually specify the default classes on the edges
@@ -242,7 +242,7 @@ var ContextView = {
     // Handle the sliding and zooming of the graph,
     // store as `this._zoomBinding` so we can unbind during destruction
     if (!this._zoomBinding) {
-      this._zoomBinding = d3.behavior.zoom().on("zoom", function () {
+      this._zoomBinding = d3.behavior.zoom().on("zoom", function() {
         var ev = d3.event;
         d3.select("#graph-target")
           .attr("transform", "translate(" + ev.translate + ") scale(" + ev.scale + ")");
@@ -263,7 +263,7 @@ var ContextView = {
    * Called once "start-context" is fired, indicating that there is an audio
    * context being created to view so render the graph.
    */
-  _onStartContext: function () {
+  _onStartContext: function() {
     this.draw();
   },
 
@@ -271,7 +271,7 @@ var ContextView = {
    * Called when `gAudioNodes` fires an event -- most events (listed
    * in GRAPH_REDRAW_EVENTS) qualify as a redraw event.
    */
-  _onEvent: function (eventName, ...args) {
+  _onEvent: function(eventName, ...args) {
     // If bypassing, just toggle the class on the SVG node
     // rather than rerendering everything
     if (eventName === "bypass") {
@@ -285,7 +285,7 @@ var ContextView = {
   /**
    * Fired when the devtools theme changes.
    */
-  _onThemeChange: function (theme) {
+  _onThemeChange: function(theme) {
     let markerColor = MARKER_STYLING[theme];
     let marker = $("#arrowhead");
     if (marker) {
@@ -299,12 +299,13 @@ var ContextView = {
    * @param Event e
    *        Click event.
    */
-  _onGraphClick: function (e) {
+  _onGraphClick: function(e) {
     let node = findGraphNodeParent(e.target);
     // If node not found (clicking outside of an audio node in the graph),
     // then ignore this event
-    if (!node)
+    if (!node) {
       return;
+    }
 
     let id = node.getAttribute("data-id");
 
diff --git a/devtools/client/webaudioeditor/views/inspector.js b/devtools/client/webaudioeditor/views/inspector.js
index d0f2471df828..ef0ace829b4a 100644
--- a/devtools/client/webaudioeditor/views/inspector.js
+++ b/devtools/client/webaudioeditor/views/inspector.js
@@ -28,7 +28,7 @@ var InspectorView = {
   /**
    * Initialization function called when the tool starts up.
    */
-  initialize: function () {
+  initialize: function() {
     // Set up view controller
     this.el = $("#web-audio-inspector");
     this.splitter = $("#inspector-splitter");
@@ -56,7 +56,7 @@ var InspectorView = {
   /**
    * Destruction function called when the tool cleans up.
    */
-  destroy: function () {
+  destroy: function() {
     this.unbindToggle();
     this.splitter.removeEventListener("mouseup", this._onResize);
 
@@ -85,9 +85,8 @@ var InspectorView = {
       $("#web-audio-editor-details-pane-empty").removeAttribute("hidden");
       $("#web-audio-editor-tabs").setAttribute("hidden", "true");
       window.emit(EVENTS.UI_INSPECTOR_NODE_SET, null);
-    }
-    // Otherwise load up the tabs view and hide the empty placeholder
-    else {
+    } else {
+      // Otherwise load up the tabs view and hide the empty placeholder
       $("#web-audio-editor-details-pane-empty").setAttribute("hidden", "true");
       $("#web-audio-editor-tabs").removeAttribute("hidden");
       this._buildToolbar();
@@ -98,14 +97,14 @@ var InspectorView = {
   /**
    * Returns the current AudioNodeView.
    */
-  getCurrentAudioNode: function () {
+  getCurrentAudioNode: function() {
     return this._currentNode;
   },
 
   /**
    * Empties out the props view.
    */
-  resetUI: function () {
+  resetUI: function() {
     // Set current node to empty to load empty view
     this.setCurrentAudioNode();
 
@@ -113,7 +112,7 @@ var InspectorView = {
     this.hideImmediately();
   },
 
-  _buildToolbar: function () {
+  _buildToolbar: function() {
     let node = this.getCurrentAudioNode();
 
     let bypassable = node.bypassable;
@@ -141,14 +140,14 @@ var InspectorView = {
    * Called on EVENTS.UI_SELECT_NODE, and takes an actorID `id`
    * and calls `setCurrentAudioNode` to scaffold the inspector view.
    */
-  _onNodeSelect: function (id) {
+  _onNodeSelect: function(id) {
     this.setCurrentAudioNode(gAudioNodes.get(id));
 
     // Ensure inspector is visible when selecting a new node
     this.show();
   },
 
-  _onResize: function () {
+  _onResize: function() {
     if (this.el.getAttribute("width") < MIN_INSPECTOR_WIDTH) {
       this.el.setAttribute("width", MIN_INSPECTOR_WIDTH);
     }
@@ -160,13 +159,13 @@ var InspectorView = {
    * Called when `DESTROY_NODE` is fired to remove the node from props view if
    * it's currently selected.
    */
-  _onDestroyNode: function (node) {
+  _onDestroyNode: function(node) {
     if (this._currentNode && this._currentNode.id === node.id) {
       this.setCurrentAudioNode(null);
     }
   },
 
-  _onCommandClick: function (e) {
+  _onCommandClick: function(e) {
     let node = this.getCurrentAudioNode();
     let button = e.target;
     let command = button.getAttribute("data-command");
diff --git a/devtools/client/webaudioeditor/views/properties.js b/devtools/client/webaudioeditor/views/properties.js
index b80db1bd23d2..1966f0dbf9ea 100644
--- a/devtools/client/webaudioeditor/views/properties.js
+++ b/devtools/client/webaudioeditor/views/properties.js
@@ -23,7 +23,7 @@ var PropertiesView = {
   /**
    * Initialization function called when the tool starts up.
    */
-  initialize: function () {
+  initialize: function() {
     this._onEval = this._onEval.bind(this);
     this._onNodeSet = this._onNodeSet.bind(this);
 
@@ -35,7 +35,7 @@ var PropertiesView = {
   /**
    * Destruction function called when the tool cleans up.
    */
-  destroy: function () {
+  destroy: function() {
     window.off(EVENTS.UI_INSPECTOR_NODE_SET, this._onNodeSet);
     this._propsView = null;
   },
@@ -43,7 +43,7 @@ var PropertiesView = {
   /**
    * Empties out the props view.
    */
-  resetUI: function () {
+  resetUI: function() {
     this._propsView.empty();
     this._currentNode = null;
   },
@@ -52,7 +52,7 @@ var PropertiesView = {
    * Internally sets the current audio node and rebuilds appropriate
    * views.
    */
-  _setAudioNode: function (node) {
+  _setAudioNode: function(node) {
     this._currentNode = node;
     if (this._currentNode) {
       this._buildPropertiesView();
@@ -95,7 +95,7 @@ var PropertiesView = {
    * Toggles the display of the "empty" properties view when
    * node has no properties to display.
    */
-  _togglePropertiesView: function (show) {
+  _togglePropertiesView: function(show) {
     let propsView = $("#properties-content");
     let emptyView = $("#properties-empty");
     (show ? propsView : emptyView).removeAttribute("hidden");
@@ -108,7 +108,7 @@ var PropertiesView = {
    *
    * @return Scope
    */
-  _getAudioPropertiesScope: function () {
+  _getAudioPropertiesScope: function() {
     return this._propsView.getScopeAtIndex(0);
   },
 
@@ -119,7 +119,7 @@ var PropertiesView = {
   /**
    * Called when the inspector view determines a node is selected.
    */
-  _onNodeSet: function (id) {
+  _onNodeSet: function(id) {
     this._setAudioNode(gAudioNodes.get(id));
   },
 
@@ -144,8 +144,7 @@ var PropertiesView = {
           value = JSON.parse(value);
         }
         error = await node.actor.setParam(propName, value);
-      }
-      catch (e) {
+      } catch (e) {
         error = e;
       }
     }
diff --git a/devtools/client/webaudioeditor/views/utils.js b/devtools/client/webaudioeditor/views/utils.js
index de1844b88b0e..9c8b6d176c89 100644
--- a/devtools/client/webaudioeditor/views/utils.js
+++ b/devtools/client/webaudioeditor/views/utils.js
@@ -11,14 +11,15 @@
 
 function findGraphNodeParent(el) {
   // Some targets may not contain `classList` property
-  if (!el.classList)
+  if (!el.classList) {
     return null;
+  }
 
   while (!el.classList.contains("nodes")) {
-    if (el.classList.contains("audionode"))
+    if (el.classList.contains("audionode")) {
       return el;
-    else
-      el = el.parentNode;
+    }
+    el = el.parentNode;
   }
   return null;
 }
@@ -39,24 +40,24 @@ function findGraphNodeParent(el) {
  */
 var ToggleMixin = {
 
-  bindToggle: function () {
+  bindToggle: function() {
     this._onToggle = this._onToggle.bind(this);
     this.button.addEventListener("mousedown", this._onToggle);
   },
 
-  unbindToggle: function () {
+  unbindToggle: function() {
     this.button.removeEventListener("mousedown", this._onToggle);
   },
 
-  show: function () {
+  show: function() {
     this._viewController({ visible: true });
   },
 
-  hide: function () {
+  hide: function() {
     this._viewController({ visible: false });
   },
 
-  hideImmediately: function () {
+  hideImmediately: function() {
     this._viewController({ visible: false, delayed: false, animated: false });
   },
 
@@ -64,7 +65,7 @@ var ToggleMixin = {
    * Returns a boolean indicating whether or not the view.
    * is currently being shown.
    */
-  isVisible: function () {
+  isVisible: function() {
     return !this.el.classList.contains("pane-collapsed");
   },
 
@@ -77,7 +78,7 @@ var ToggleMixin = {
    *        - delayed: boolean indicating whether the pane's opening should wait
    *                   a few cycles or not
    */
-  _viewController: function ({ visible, animated, delayed }) {
+  _viewController: function({ visible, animated, delayed }) {
     let flags = {
       visible: visible,
       animated: animated != null ? animated : !!this._animated,
@@ -90,14 +91,13 @@ var ToggleMixin = {
     if (flags.visible) {
       this.button.classList.remove("pane-collapsed");
       this.button.setAttribute("tooltiptext", this._collapseString);
-    }
-    else {
+    } else {
       this.button.classList.add("pane-collapsed");
       this.button.setAttribute("tooltiptext", this._expandString);
     }
   },
 
-  _onToggle: function () {
+  _onToggle: function() {
     this._viewController({ visible: !this.isVisible() });
   }
 };
diff --git a/devtools/client/webconsole/old/test/head.js b/devtools/client/webconsole/old/test/head.js
index 8f2c947a0ad5..99b7bfce92d3 100644
--- a/devtools/client/webconsole/old/test/head.js
+++ b/devtools/client/webconsole/old/test/head.js
@@ -43,8 +43,6 @@ const DOCS_GA_PARAMS = "?utm_source=mozilla" +
                        "&utm_medium=firefox-console-errors" +
                        "&utm_campaign=default";
 
-flags.testing = true;
-
 Services.prefs.setBoolPref("devtools.browserconsole.new-frontend-enabled", false);
 registerCleanupFunction(async function () {
   Services.prefs.clearUserPref("devtools.browserconsole.new-frontend-enabled");
@@ -325,8 +323,6 @@ registerCleanupFunction(function* () {
 });
 
 registerCleanupFunction(function* () {
-  flags.testing = false;
-
   // Remove stored console commands in between tests
   yield asyncStorage.removeItem("webConsoleHistory");
 
diff --git a/devtools/client/webconsole/reducers/messages.js b/devtools/client/webconsole/reducers/messages.js
index 8dead06cc861..90c90c68cebb 100644
--- a/devtools/client/webconsole/reducers/messages.js
+++ b/devtools/client/webconsole/reducers/messages.js
@@ -18,6 +18,7 @@ const {
   MESSAGE_SOURCE,
 } = constants;
 const { getGripPreviewItems } = require("devtools/client/shared/components/reps/reps");
+const { getUnicodeUrlPath } = require("devtools/client/shared/unicode-url");
 const { getSourceNames } = require("devtools/client/shared/source-utils");
 
 const {
@@ -782,10 +783,13 @@ function isTextInFrame(text, frame) {
     source
   } = frame;
   const { short } = getSourceNames(source);
+  const unicodeShort = getUnicodeUrlPath(short);
 
-  return `${functionName ? functionName + " " : ""}${short}:${line}:${column}`
+  const includes =
+    `${functionName ? functionName + " " : ""}${unicodeShort}:${line}:${column}`
     .toLocaleLowerCase()
     .includes(text.toLocaleLowerCase());
+  return includes;
 }
 
 /**
diff --git a/devtools/client/webconsole/test/mochitest/browser.ini b/devtools/client/webconsole/test/mochitest/browser.ini
index ba68501c2e92..c11d84e81a03 100644
--- a/devtools/client/webconsole/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/test/mochitest/browser.ini
@@ -20,9 +20,6 @@ support-files =
   test_hsts-invalid-headers.sjs
   test-autocomplete-in-stackframe.html
   test-batching.html
-  test-bug_923281_console_log_filter.html
-  test-bug_923281_test1.js
-  test-bug_923281_test2.js
   test-console-trace-duplicates.html
   test-bug-585956-console-trace.html
   test-bug-599725-response-headers.sjs
@@ -278,6 +275,7 @@ skip-if = (e10s && debug) || (e10s && os == 'win') # Bug 1221499 enabled these o
 [browser_webconsole_external_script_errors.js]
 [browser_webconsole_file_uri.js]
 skip-if = true #	Bug 1404382
+[browser_webconsole_filter_by_input.js]
 [browser_webconsole_filter_scroll.js]
 [browser_webconsole_filters.js]
 [browser_webconsole_filters_persist.js]
diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_filter_by_input.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_filter_by_input.js
new file mode 100644
index 000000000000..4bbf0e9180e1
--- /dev/null
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_filter_by_input.js
@@ -0,0 +1,242 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Tests that the text filter box works to filter based on location.
+
+"use strict";
+
+// In this test, we are trying to test the filtering functionality of the filter
+// input. We test filtering not only for the contents of logs themseleves but
+// also for the filenames.
+//
+// We simulate an HTML file which executes two Javascript files, one with an
+// ASCII filename outputs some ASCII logs and the other one with a Unicode
+// filename outputs some Unicode logs.
+
+const SEASON = {
+  english: "season",
+  chinese: "\u5b63",
+};
+const SEASONS = [
+  {
+    english: "spring",
+    chinese: "\u6625",
+    escapedChinese: "\\u6625",
+  },
+  {
+    english: "summer",
+    chinese: "\u590f",
+    escapedChinese: "\\u590f",
+  },
+  {
+    english: "autumn",
+    chinese: "\u79cb",
+    escapedChinese: "\\u79cb",
+  },
+  {
+    english: "winter",
+    chinese: "\u51ac",
+    escapedChinese: "\\u51ac",
+  },
+];
+
+// filenames
+const HTML_FILENAME = `test.html`;
+const JS_ASCII_FILENAME = `${SEASON.english}.js`;
+const JS_UNICODE_FILENAME = `${SEASON.chinese}.js`;
+const ENCODED_JS_UNICODE_FILENAME = encodeURIComponent(JS_UNICODE_FILENAME);
+
+// file contents
+const HTML_CONSOLE_OUTPUT = `Test filtering ${SEASON.english} names.`;
+const HTML_CONTENT = `<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test filtering logs by filling keywords in the filter input.</title>
+<script>
+console.log("${HTML_CONSOLE_OUTPUT}");
+</script>
+<script src="/${JS_ASCII_FILENAME}"></script>
+<script src="/${ENCODED_JS_UNICODE_FILENAME}"></script>`;
+
+add_task(async function() {
+  const testUrl = createServerAndGetTestUrl();
+  const hud = await openNewTabAndConsole(testUrl);
+
+  // Let's wait for the last logged message of each file to be displayed in the
+  // output, in order to make sure all the logged messages have been displayed.
+  const lastSeason = SEASONS[SEASONS.length - 1];
+  await waitFor(() =>
+    findMessage(hud, lastSeason.english) &&
+    findMessage(hud, lastSeason.chinese)
+  );
+
+  // One external Javascript file outputs every season name in English, and the
+  // other Javascript file outputs every season name in Chinese.
+  // The HTML file outputs one line on its own.
+  // So the total number of all the logs is the doubled number of seasons plus
+  // one.
+  let visibleLogs = getVisibleLogs(hud);
+  is(visibleLogs.length, SEASONS.length * 2 + 1,
+       "the total number of all the logs before starting filtering");
+  checkLogContent(visibleLogs[0], HTML_CONSOLE_OUTPUT, HTML_FILENAME);
+  for (let i = 0; i < SEASONS.length; i++) {
+    checkLogContent(visibleLogs[i + 1], SEASONS[i].english, JS_ASCII_FILENAME);
+  }
+  for (let i = 0; i < SEASONS.length; i++) {
+    checkLogContent(visibleLogs[i + 1 + SEASONS.length], SEASONS[i].chinese,
+                    JS_UNICODE_FILENAME);
+  }
+
+  // All the logs outputted by the ASCII Javascript file are visible, the others
+  // are hidden.
+  setFilterInput(hud, JS_ASCII_FILENAME);
+  visibleLogs = getVisibleLogs(hud);
+  is(visibleLogs.length, SEASONS.length,
+       `the number of all the logs containing ${JS_ASCII_FILENAME}`);
+  for (let i = 0; i < SEASONS.length; i++) {
+    checkLogContent(visibleLogs[i], SEASONS[i].english, JS_ASCII_FILENAME);
+  }
+
+  // Every season name in English is outputted once.
+  for (let curSeason of SEASONS) {
+    setFilterInput(hud, curSeason.english);
+    visibleLogs = getVisibleLogs(hud);
+    is(visibleLogs.length, 1,
+         `the number of all the logs containing ${curSeason.english}`);
+    checkLogContent(visibleLogs[0], curSeason.english, JS_ASCII_FILENAME);
+  }
+
+  // All the logs outputted by the Unicode Javascript file are visible, the
+  // others are hidden.
+  setFilterInput(hud, JS_UNICODE_FILENAME);
+  visibleLogs = getVisibleLogs(hud);
+  is(visibleLogs.length, SEASONS.length,
+       `the number of all the logs containing ${JS_UNICODE_FILENAME}`);
+  for (let i = 0; i < SEASONS.length; i++) {
+    checkLogContent(visibleLogs[i], SEASONS[i].chinese, JS_UNICODE_FILENAME);
+  }
+
+  // Every season name in Chinese is outputted once.
+  for (let curSeason of SEASONS) {
+    setFilterInput(hud, curSeason.chinese);
+    visibleLogs = getVisibleLogs(hud);
+    is(visibleLogs.length, 1,
+         `the number of all the logs containing ${curSeason.chinese}`);
+    checkLogContent(visibleLogs[0], curSeason.chinese, JS_UNICODE_FILENAME);
+  }
+
+  // The filename of the ASCII Javascript file contains the English word season,
+  // so all the logs outputted by the file are visible, besides, the HTML
+  // outputs one line containing the English word season, so it is also visible.
+  // The other logs are hidden. So the number of all the visible logs is the
+  // season number plus one.
+  setFilterInput(hud, SEASON.english);
+  visibleLogs = getVisibleLogs(hud);
+  is(visibleLogs.length, SEASONS.length + 1,
+       `the number of all the logs containing ${SEASON.english}`);
+  checkLogContent(visibleLogs[0], HTML_CONSOLE_OUTPUT, HTML_FILENAME);
+  for (let i = 0; i < SEASONS.length; i++) {
+    checkLogContent(visibleLogs[i + 1], SEASONS[i].english, JS_ASCII_FILENAME);
+  }
+
+  // The filename of the Unicode Javascript file contains the Chinese word
+  // season, so all the logs outputted by the file are visible. The other logs
+  // are hidden. So the number of all the visible logs is the season number.
+  setFilterInput(hud, SEASON.chinese);
+  visibleLogs = getVisibleLogs(hud);
+  is(visibleLogs.length, SEASONS.length,
+       `the number of all the logs containing ${SEASON.chinese}`);
+  for (let i = 0; i < SEASONS.length; i++) {
+    checkLogContent(visibleLogs[i], SEASONS[i].chinese, JS_UNICODE_FILENAME);
+  }
+
+  // After clearing the text in the filter input box, all the logs are visible
+  // again.
+  clearFilterInput(hud);
+  visibleLogs = getVisibleLogs(hud);
+  is(visibleLogs.length, SEASONS.length * 2 + 1,
+       "the total number of all the logs after clearing filtering");
+  checkLogContent(visibleLogs[0], HTML_CONSOLE_OUTPUT, HTML_FILENAME);
+  for (let i = 0; i < SEASONS.length; i++) {
+    checkLogContent(visibleLogs[i + 1], SEASONS[i].english, JS_ASCII_FILENAME);
+  }
+  for (let i = 0; i < SEASONS.length; i++) {
+    checkLogContent(visibleLogs[i + 1 + SEASONS.length], SEASONS[i].chinese,
+                    JS_UNICODE_FILENAME);
+  }
+});
+
+// Create an HTTP server to simulate a response for the a URL request and return
+// the URL.
+function createServerAndGetTestUrl() {
+  const httpServer = createTestHTTPServer();
+
+  httpServer.registerContentType("html", "text/html");
+  httpServer.registerContentType("js", "application/javascript");
+
+  httpServer.registerPathHandler("/" + HTML_FILENAME,
+    function(request, response) {
+      response.setStatusLine(request.httpVersion, 200, "OK");
+      response.write(HTML_CONTENT);
+    }
+  );
+  httpServer.registerPathHandler("/" + JS_ASCII_FILENAME,
+    function(request, response) {
+      response.setStatusLine(request.httpVersion, 200, "OK");
+      let content = "";
+      for (let curSeason of SEASONS) {
+        content += `console.log("${curSeason.english}");`;
+      }
+      response.write(content);
+    }
+  );
+  httpServer.registerPathHandler("/" + ENCODED_JS_UNICODE_FILENAME,
+    function(request, response) {
+      response.setStatusLine(request.httpVersion, 200, "OK");
+      let content = "";
+      for (let curSeason of SEASONS) {
+        content += `console.log("${curSeason.escapedChinese}");`;
+      }
+      response.write(content);
+    }
+  );
+  const port = httpServer.identity.primaryPort;
+  return `http://localhost:${port}/${HTML_FILENAME}`;
+}
+
+function setFilterInput(hud, value) {
+  hud.ui.filterBox.focus();
+  hud.ui.filterBox.select();
+  EventUtils.sendString(value);
+}
+
+function clearFilterInput(hud) {
+  hud.ui.filterBox.focus();
+  hud.ui.filterBox.select();
+  EventUtils.synthesizeKey("KEY_Delete");
+}
+
+function getVisibleLogs(hud) {
+  let outputNode = hud.outputNode;
+  return outputNode.querySelectorAll(".message");
+}
+
+/**
+ * Check if the content of a log message is what we expect.
+ *
+ * @param Object node
+ *        The node for the log message.
+ * @param String expectedMessageBody
+ *        The string we expect to match the message body in the log message.
+ * @param String expectedFilename
+ *        The string we expect to match the filename in the log message.
+ */
+function checkLogContent(node, expectedMessageBody, expectedFilename) {
+  const messageBody = node.querySelector(".message-body").textContent;
+  const location = node.querySelector(".message-location").textContent;
+  // The location detail contains the line number and the column number, let's
+  // strip them to get the filename.
+  const filename = location.split(":")[0];
+
+  is(messageBody, expectedMessageBody, "the expected message body");
+  is(filename, expectedFilename, "the expected filename");
+}
diff --git a/devtools/client/webconsole/webpack.config.js b/devtools/client/webconsole/webpack.config.js
index 506e51f16e63..f8fd6e9e607b 100644
--- a/devtools/client/webconsole/webpack.config.js
+++ b/devtools/client/webconsole/webpack.config.js
@@ -92,6 +92,7 @@ webpackConfig.resolve = {
     "devtools/client/framework/menu": "devtools-modules/src/menu",
     "devtools/client/sourceeditor/editor": "devtools-source-editor/src/source-editor",
 
+    "devtools/client/shared/unicode-url": path.join(__dirname, "../../client/shared/webpack/shims/unicode-url-stub"),
     "devtools/client/shared/zoom-keys": "devtools-modules/src/zoom-keys",
 
     "devtools/shared/fronts/timeline": path.join(__dirname, "../../client/shared/webpack/shims/fronts-timeline-shim"),
diff --git a/devtools/client/webide/content/addons.js b/devtools/client/webide/content/addons.js
index e57291efeca8..2da38a79353f 100644
--- a/devtools/client/webide/content/addons.js
+++ b/devtools/client/webide/content/addons.js
@@ -8,8 +8,8 @@ const {gDevTools} = require("devtools/client/framework/devtools");
 const {GetAvailableAddons, ForgetAddonsList} = require("devtools/client/webide/modules/addons");
 const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties");
 
-window.addEventListener("load", function () {
-  document.querySelector("#aboutaddons").onclick = function () {
+window.addEventListener("load", function() {
+  document.querySelector("#aboutaddons").onclick = function() {
     let browserWin = Services.wm.getMostRecentWindow(gDevTools.chromeWindowType);
     if (browserWin && browserWin.BrowserOpenAddonsMgr) {
       browserWin.BrowserOpenAddonsMgr("addons://list/extension");
@@ -19,7 +19,7 @@ window.addEventListener("load", function () {
   BuildUI(GetAvailableAddons());
 }, {capture: true, once: true});
 
-window.addEventListener("unload", function () {
+window.addEventListener("unload", function() {
   ForgetAddonsList();
 }, {capture: true, once: true});
 
@@ -32,7 +32,6 @@ function BuildUI(addons) {
 }
 
 function BuildItem(addon, type) {
-
   function onAddonUpdate(arg) {
     progress.removeAttribute("value");
     li.setAttribute("status", addon.status);
@@ -55,7 +54,7 @@ function BuildItem(addon, type) {
   addon.on("failure", onAddonFailure);
   addon.on("progress", onAddonProgress);
 
-  window.addEventListener("unload", function () {
+  window.addEventListener("unload", function() {
     addon.off("update", onAddonUpdate);
     addon.off("failure", onAddonFailure);
     addon.off("progress", onAddonProgress);
diff --git a/devtools/client/webide/content/details.js b/devtools/client/webide/content/details.js
index 42e8a12d3371..82118d3ff626 100644
--- a/devtools/client/webide/content/details.js
+++ b/devtools/client/webide/content/details.js
@@ -3,16 +3,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
-const Services = require("Services");
 const {AppManager} = require("devtools/client/webide/modules/app-manager");
 
-window.addEventListener("load", function () {
+window.addEventListener("load", function() {
   document.addEventListener("visibilitychange", updateUI, true);
   AppManager.on("app-manager-update", onAppManagerUpdate);
   updateUI();
 }, {capture: true, once: true});
 
-window.addEventListener("unload", function () {
+window.addEventListener("unload", function() {
   AppManager.off("app-manager-update", onAppManagerUpdate);
 }, {capture: true, once: true});
 
@@ -40,7 +39,6 @@ function resetUI() {
 
   document.querySelector("#errorslist").innerHTML = "";
   document.querySelector("#warningslist").innerHTML = "";
-
 }
 
 function updateUI() {
@@ -118,6 +116,8 @@ function updateUI() {
   AppManager.update("details");
 }
 
+// Used in details.xhtml.
+/* exported removeProject */
 function removeProject() {
   AppManager.removeSelectedProject();
 }
diff --git a/devtools/client/webide/content/devicepreferences.js b/devtools/client/webide/content/devicepreferences.js
index f460bdffec33..02f5ee79e758 100644
--- a/devtools/client/webide/content/devicepreferences.js
+++ b/devtools/client/webide/content/devicepreferences.js
@@ -9,7 +9,7 @@ const ConfigView = require("devtools/client/webide/modules/config-view");
 
 var configView = new ConfigView(window);
 
-window.addEventListener("load", function () {
+window.addEventListener("load", function() {
   AppManager.on("app-manager-update", OnAppManagerUpdate);
   document.getElementById("close").onclick = CloseUI;
   document.getElementById("device-fields").onchange = UpdateField;
@@ -21,7 +21,7 @@ window.addEventListener("load", function () {
   BuildUI();
 }, {capture: true, once: true});
 
-window.addEventListener("unload", function () {
+window.addEventListener("unload", function() {
   AppManager.off("app-manager-update", OnAppManagerUpdate);
 }, {once: true});
 
@@ -59,7 +59,9 @@ function SearchField(event) {
   configView.search(event);
 }
 
-var getAllPrefs; // Used by tests
+// Used by tests
+/* exported getAllPrefs */
+var getAllPrefs;
 function BuildUI() {
   configView.resetTable();
 
diff --git a/devtools/client/webide/content/newapp.js b/devtools/client/webide/content/newapp.js
index f4fa13402cec..1bc25f1029fb 100644
--- a/devtools/client/webide/content/newapp.js
+++ b/devtools/client/webide/content/newapp.js
@@ -5,7 +5,6 @@
 "use strict";
 
 const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
-const {XPCOMUtils} = require("resource://gre/modules/XPCOMUtils.jsm");
 const Services = require("Services");
 const {FileUtils} = require("resource://gre/modules/FileUtils.jsm");
 const {AppProjects} = require("devtools/client/webide/modules/app-projects");
@@ -19,7 +18,7 @@ const TEMPLATES_URL = "devtools.webide.templatesURL";
 
 var gTemplateList = null;
 
-window.addEventListener("load", function () {
+window.addEventListener("load", function() {
   let projectNameNode = document.querySelector("#project-name");
   projectNameNode.addEventListener("input", canValidate, true);
   getTemplatesJSON();
@@ -67,8 +66,7 @@ function getTemplatesJSON() {
 }
 
 function failAndBail(msg) {
-  let promptService = Cc["@mozilla.org/embedcomp/prompt-service;1"].getService(Ci.nsIPromptService);
-  promptService.alert(window, "error", msg);
+  Services.prompt.alert(window, "error", msg);
   window.close();
 }
 
@@ -154,7 +152,9 @@ function doOK() {
             project.manifest.name = projectName;
             AppManager.writeManifest(project).then(() => {
               AppManager.validateAndUpdateProject(project).then(
-                () => {window.close();}, bail);
+                () => {
+                  window.close();
+                }, bail);
             }, bail);
           } else {
             bail("Manifest not found");
diff --git a/devtools/client/webide/content/prefs.js b/devtools/client/webide/content/prefs.js
index 5ffa7ceb3a81..df0dd2235c4a 100644
--- a/devtools/client/webide/content/prefs.js
+++ b/devtools/client/webide/content/prefs.js
@@ -6,7 +6,7 @@
 
 const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
 
-window.addEventListener("load", function () {
+window.addEventListener("load", function() {
   // Listen to preference changes
   let inputs = document.querySelectorAll("[data-pref]");
   for (let i of inputs) {
@@ -22,10 +22,9 @@ window.addEventListener("load", function () {
 
   // Initialize the controls
   FillForm();
-
 }, {capture: true, once: true});
 
-window.addEventListener("unload", function () {
+window.addEventListener("unload", function() {
   let inputs = document.querySelectorAll("[data-pref]");
   for (let i of inputs) {
     let pref = i.dataset.pref;
diff --git a/devtools/client/webide/content/project-listing.js b/devtools/client/webide/content/project-listing.js
index e4a8e4b0e4a7..a377f136c9c3 100644
--- a/devtools/client/webide/content/project-listing.js
+++ b/devtools/client/webide/content/project-listing.js
@@ -9,7 +9,7 @@ const ProjectList = require("devtools/client/webide/modules/project-list");
 
 var projectList = new ProjectList(window, window.parent);
 
-window.addEventListener("load", function () {
+window.addEventListener("load", function() {
   document.getElementById("new-app").onclick = CreateNewApp;
   document.getElementById("hosted-app").onclick = ImportHostedApp;
   document.getElementById("packaged-app").onclick = ImportPackagedApp;
@@ -18,7 +18,7 @@ window.addEventListener("load", function () {
   projectList.updateCommands();
 }, {capture: true, once: true});
 
-window.addEventListener("unload", function () {
+window.addEventListener("unload", function() {
   projectList.destroy();
 }, {once: true});
 
diff --git a/devtools/client/webide/content/project-panel.js b/devtools/client/webide/content/project-panel.js
index 54eab82518c7..e10230c2bdf6 100644
--- a/devtools/client/webide/content/project-panel.js
+++ b/devtools/client/webide/content/project-panel.js
@@ -2,9 +2,10 @@
  * 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/. */
 
+/* exported ProjectPanel */
 var ProjectPanel = {
   // TODO: Expand function to save toggle state.
-  toggleSidebar: function () {
+  toggleSidebar: function() {
     document.querySelector("#project-listing-panel").setAttribute("sidebar-displayed", true);
     document.querySelector("#project-listing-splitter").setAttribute("sidebar-displayed", true);
   }
diff --git a/devtools/client/webide/content/runtime-listing.js b/devtools/client/webide/content/runtime-listing.js
index f965f09dc167..38a5e4c372e9 100644
--- a/devtools/client/webide/content/runtime-listing.js
+++ b/devtools/client/webide/content/runtime-listing.js
@@ -7,7 +7,7 @@ const RuntimeList = require("devtools/client/webide/modules/runtime-list");
 
 var runtimeList = new RuntimeList(window, window.parent);
 
-window.addEventListener("load", function () {
+window.addEventListener("load", function() {
   document.getElementById("runtime-screenshot").onclick = TakeScreenshot;
   document.getElementById("runtime-details").onclick = ShowRuntimeDetails;
   document.getElementById("runtime-disconnect").onclick = DisconnectRuntime;
@@ -20,7 +20,7 @@ window.addEventListener("load", function () {
   runtimeList.updateCommands();
 }, {capture: true, once: true});
 
-window.addEventListener("unload", function () {
+window.addEventListener("unload", function() {
   runtimeList.destroy();
 }, {once: true});
 
diff --git a/devtools/client/webide/content/runtime-panel.js b/devtools/client/webide/content/runtime-panel.js
index 3646fa15cc3c..6563a0921f6e 100644
--- a/devtools/client/webide/content/runtime-panel.js
+++ b/devtools/client/webide/content/runtime-panel.js
@@ -2,9 +2,10 @@
  * 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/. */
 
+/* exported RuntimePanel */
 var RuntimePanel = {
   // TODO: Expand function to save toggle state.
-  toggleSidebar: function () {
+  toggleSidebar: function() {
     document.querySelector("#runtime-listing-panel").setAttribute("sidebar-displayed", true);
     document.querySelector("#runtime-listing-splitter").setAttribute("sidebar-displayed", true);
   }
diff --git a/devtools/client/webide/content/runtimedetails.js b/devtools/client/webide/content/runtimedetails.js
index a70e43617caa..61bd680a21d9 100644
--- a/devtools/client/webide/content/runtimedetails.js
+++ b/devtools/client/webide/content/runtimedetails.js
@@ -11,11 +11,11 @@ const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.p
 
 const UNRESTRICTED_HELP_URL = "https://developer.mozilla.org/docs/Tools/WebIDE/Running_and_debugging_apps#Unrestricted_app_debugging_%28including_certified_apps_main_process_etc.%29";
 
-window.addEventListener("load", function () {
+window.addEventListener("load", function() {
   document.querySelector("#close").onclick = CloseUI;
   document.querySelector("#devtools-check button").onclick = EnableCertApps;
   document.querySelector("#adb-check button").onclick = RootADB;
-  document.querySelector("#unrestricted-privileges").onclick = function () {
+  document.querySelector("#unrestricted-privileges").onclick = function() {
     window.parent.UI.openInBrowser(UNRESTRICTED_HELP_URL);
   };
   AppManager.on("app-manager-update", OnAppManagerUpdate);
@@ -23,7 +23,7 @@ window.addEventListener("load", function () {
   CheckLockState();
 }, {capture: true, once: true});
 
-window.addEventListener("unload", function () {
+window.addEventListener("unload", function() {
   AppManager.off("app-manager-update", OnAppManagerUpdate);
 }, {once: true});
 
@@ -52,7 +52,9 @@ function generateFields(json) {
   }
 }
 
-var getDescriptionPromise; // Used by tests
+// Used by tests
+/* exported getDescriptionPromise */
+var getDescriptionPromise;
 function BuildUI() {
   let table = document.querySelector("table");
   table.innerHTML = "";
@@ -70,7 +72,6 @@ function CheckLockState() {
   let adbCheckResult = document.querySelector("#adb-check > .yesno");
   let devtoolsCheckResult = document.querySelector("#devtools-check > .yesno");
   let flipCertPerfButton = document.querySelector("#devtools-check button");
-  let adbRootButton = document.querySelector("#adb-check button");
   let flipCertPerfAction = document.querySelector("#devtools-check > .action");
   let adbRootAction = document.querySelector("#adb-check > .action");
 
@@ -88,7 +89,6 @@ function CheckLockState() {
 
   if (AppManager.connection &&
       AppManager.connection.status == Connection.Status.CONNECTED) {
-
     // ADB check
     if (AppManager.selectedRuntime.type === RuntimeTypes.USB) {
       let device = AppManager.selectedRuntime.device;
@@ -125,9 +125,7 @@ function CheckLockState() {
       devtoolsCheckResult.textContent = sNo;
       flipCertPerfAction.removeAttribute("hidden");
     }
-
   }
-
 }
 
 function EnableCertApps() {
diff --git a/devtools/client/webide/content/webide.js b/devtools/client/webide/content/webide.js
index c8740a35d633..ea2a4b6235f7 100644
--- a/devtools/client/webide/content/webide.js
+++ b/devtools/client/webide/content/webide.js
@@ -2,6 +2,10 @@
  * 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/. */
 
+// These files are loaded via webide.xul
+/* import-globals-from project-panel.js */
+/* import-globals-from runtime-panel.js */
+
 const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const {gDevTools} = require("devtools/client/framework/devtools");
 const {gDevToolsBrowser} = require("devtools/client/framework/devtools-browser");
@@ -14,14 +18,12 @@ const EventEmitter = require("devtools/shared/event-emitter");
 const promise = require("promise");
 const {GetAvailableAddons} = require("devtools/client/webide/modules/addons");
 const {getJSON} = require("devtools/client/shared/getjson");
-const utils = require("devtools/client/webide/modules/utils");
 const Telemetry = require("devtools/client/shared/telemetry");
 const {RuntimeScanners} = require("devtools/client/webide/modules/runtimes");
 const {showDoorhanger} = require("devtools/client/shared/doorhanger");
 
 const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties");
 
-const HTML = "http://www.w3.org/1999/xhtml";
 const HELP_URL = "https://developer.mozilla.org/docs/Tools/WebIDE/Troubleshooting";
 
 const MAX_ZOOM = 1.4;
@@ -41,16 +43,16 @@ const MIN_ZOOM = 0.6;
 getJSON("devtools.webide.templatesURL");
 getJSON("devtools.devices.url");
 
-window.addEventListener("load", function () {
+window.addEventListener("load", function() {
   UI.init();
 }, {once: true});
 
-window.addEventListener("unload", function () {
+window.addEventListener("unload", function() {
   UI.destroy();
 }, {once: true});
 
 var UI = {
-  init: function () {
+  init: function() {
     this._telemetry = new Telemetry();
     this._telemetry.toolOpened("webide");
 
@@ -95,7 +97,7 @@ var UI = {
     gDevToolsBrowser.isWebIDEInitialized.resolve();
   },
 
-  destroy: function () {
+  destroy: function() {
     window.removeEventListener("focus", this.onfocus, true);
     AppManager.off("app-manager-update", this.appManagerUpdate);
     AppManager.destroy();
@@ -104,7 +106,7 @@ var UI = {
     this._telemetry.destroy();
   },
 
-  onfocus: function () {
+  onfocus: function() {
     // Because we can't track the activity in the folder project,
     // we need to validate the project regularly. Let's assume that
     // if a modification happened, it happened when the window was
@@ -122,7 +124,7 @@ var UI = {
     showDoorhanger({ window, type: "deveditionpromo", anchor: document.querySelector("#deck") });
   },
 
-  appManagerUpdate: function (what, details) {
+  appManagerUpdate: function(what, details) {
     // Got a message from app-manager.js
     // See AppManager.update() for descriptions of what these events mean.
     switch (what) {
@@ -135,7 +137,7 @@ var UI = {
         this.updateConnectionTelemetry();
         break;
       case "project":
-        this._updatePromise = (async function () {
+        this._updatePromise = (async function() {
           UI.updateTitle();
           await UI.destroyToolbox();
           UI.updateCommands();
@@ -178,18 +180,18 @@ var UI = {
     this._updatePromise = promise.resolve();
   },
 
-  openInBrowser: function (url) {
+  openInBrowser: function(url) {
     // Open a URL in a Firefox window
     let mainWindow = Services.wm.getMostRecentWindow(gDevTools.chromeWindowType);
     if (mainWindow) {
       mainWindow.openWebLinkIn(url, "tab");
-      mainWindow.focus()
+      mainWindow.focus();
     } else {
       window.open(url);
     }
   },
 
-  updateTitle: function () {
+  updateTitle: function() {
     let project = AppManager.selectedProject;
     if (project) {
       window.document.title = Strings.formatStringFromName("title_app", [project.name], 1);
@@ -204,7 +206,7 @@ var UI = {
   _busyOperationDescription: null,
   _busyPromise: null,
 
-  busy: function () {
+  busy: function() {
     let win = document.querySelector("window");
     win.classList.add("busy");
     win.classList.add("busy-undetermined");
@@ -212,7 +214,7 @@ var UI = {
     this.update("busy");
   },
 
-  unbusy: function () {
+  unbusy: function() {
     let win = document.querySelector("window");
     win.classList.remove("busy");
     win.classList.remove("busy-determined");
@@ -222,7 +224,7 @@ var UI = {
     this._busyPromise = null;
   },
 
-  setupBusyTimeout: function () {
+  setupBusyTimeout: function() {
     this.cancelBusyTimeout();
     this._busyTimeout = setTimeout(() => {
       this.unbusy();
@@ -230,11 +232,11 @@ var UI = {
     }, Services.prefs.getIntPref("devtools.webide.busyTimeout"));
   },
 
-  cancelBusyTimeout: function () {
+  cancelBusyTimeout: function() {
     clearTimeout(this._busyTimeout);
   },
 
-  busyWithProgressUntil: function (promise, operationDescription) {
+  busyWithProgressUntil: function(promise, operationDescription) {
     let busy = this.busyUntil(promise, operationDescription);
     let win = document.querySelector("window");
     let progress = document.querySelector("#action-busy-determined");
@@ -244,7 +246,7 @@ var UI = {
     return busy;
   },
 
-  busyUntil: function (promise, operationDescription) {
+  busyUntil: function(promise, operationDescription) {
     // Freeze the UI until the promise is resolved. A timeout will unfreeze the
     // UI, just in case the promise never gets resolved.
     this._busyPromise = promise;
@@ -276,7 +278,7 @@ var UI = {
     return promise;
   },
 
-  reportError: function (l10nProperty, ...l10nArgs) {
+  reportError: function(l10nProperty, ...l10nArgs) {
     let text;
 
     if (l10nArgs.length > 0) {
@@ -290,7 +292,7 @@ var UI = {
     let buttons = [{
       label: Strings.GetStringFromName("notification_showTroubleShooting_label"),
       accessKey: Strings.GetStringFromName("notification_showTroubleShooting_accesskey"),
-      callback: function () {
+      callback: function() {
         Cmds.showTroubleShooting();
       }
     }];
@@ -301,7 +303,7 @@ var UI = {
                             nbox.PRIORITY_WARNING_LOW, buttons);
   },
 
-  dismissErrorNotification: function () {
+  dismissErrorNotification: function() {
     let nbox = document.querySelector("#notificationbox");
     nbox.removeAllNotifications(true);
   },
@@ -317,11 +319,11 @@ var UI = {
    *   unbusy:
    *     The window is not busy and certain UI functions may be re-enabled.
    */
-  update: function (what, details) {
+  update: function(what, details) {
     this.emit("webide-update", what, details);
   },
 
-  updateCommands: function () {
+  updateCommands: function() {
     // Action commands
     let playCmd = document.querySelector("#cmd_play");
     let stopCmd = document.querySelector("#cmd_stop");
@@ -362,13 +364,11 @@ var UI = {
       } else if (AppManager.selectedProject.type == "mainProcess") {
         playCmd.setAttribute("disabled", "true");
         stopCmd.setAttribute("disabled", "true");
-      } else {
-        if (AppManager.selectedProject.errorsCount == 0 &&
+      } else if (AppManager.selectedProject.errorsCount == 0 &&
             AppManager.runtimeCanHandleApps()) {
-          playCmd.removeAttribute("disabled");
-        } else {
-          playCmd.setAttribute("disabled", "true");
-        }
+        playCmd.removeAttribute("disabled");
+      } else {
+        playCmd.setAttribute("disabled", "true");
       }
     }
 
@@ -409,7 +409,7 @@ var UI = {
     projectPanelCmd.removeAttribute("disabled");
   },
 
-  updateRemoveProjectButton: function () {
+  updateRemoveProjectButton: function() {
     // Remove command
     let removeCmdNode = document.querySelector("#cmd_removeProject");
     if (AppManager.selectedProject) {
@@ -429,7 +429,7 @@ var UI = {
     Services.prefs.setCharPref("devtools.webide.lastConnectedRuntime", runtime);
   },
 
-  autoConnectRuntime: function () {
+  autoConnectRuntime: function() {
     // Automatically reconnect to the previously selected runtime,
     // if available and has an ID and feature is enabled
     if (AppManager.selectedRuntime ||
@@ -437,7 +437,7 @@ var UI = {
         !this.lastConnectedRuntime) {
       return;
     }
-    let [_, type, id] = this.lastConnectedRuntime.match(/^(\w+):(.+)$/);
+    let [ , type, id] = this.lastConnectedRuntime.match(/^(\w+):(.+)$/);
 
     type = type.toLowerCase();
 
@@ -461,7 +461,7 @@ var UI = {
     }
   },
 
-  connectToRuntime: function (runtime) {
+  connectToRuntime: function(runtime) {
     let name = runtime.name;
     let promise = AppManager.connectToRuntime(runtime);
     promise.then(() => this.initConnectionTelemetry())
@@ -479,7 +479,7 @@ var UI = {
     return promise;
   },
 
-  updateRuntimeButton: function () {
+  updateRuntimeButton: function() {
     let labelNode = document.querySelector("#runtime-panel-button > .panel-button-label");
     if (!AppManager.selectedRuntime) {
       labelNode.setAttribute("value", Strings.GetStringFromName("runtimeButton_label"));
@@ -489,7 +489,7 @@ var UI = {
     }
   },
 
-  saveLastConnectedRuntime: function () {
+  saveLastConnectedRuntime: function() {
     if (AppManager.selectedRuntime &&
         AppManager.selectedRuntime.id !== undefined) {
       this.lastConnectedRuntime = AppManager.selectedRuntime.type + ":" +
@@ -508,7 +508,7 @@ var UI = {
    * one value is collected for each button, even if they are used multiple
    * times during a connection.
    */
-  initConnectionTelemetry: function () {
+  initConnectionTelemetry: function() {
     this._actionsToLog.add("play");
     this._actionsToLog.add("debug");
   },
@@ -517,7 +517,7 @@ var UI = {
    * Action occurred.  Log that it happened, and remove it from the loggable
    * set.
    */
-  onAction: function (action) {
+  onAction: function(action) {
     if (!this._actionsToLog.has(action)) {
       return;
     }
@@ -529,14 +529,14 @@ var UI = {
    * Connection status changed or we are shutting down.  Record any loggable
    * actions as having not occurred.
    */
-  updateConnectionTelemetry: function () {
+  updateConnectionTelemetry: function() {
     for (let action of this._actionsToLog.values()) {
       this.logActionState(action, false);
     }
     this._actionsToLog.clear();
   },
 
-  logActionState: function (action, state) {
+  logActionState: function(action, state) {
     let histogramId = "DEVTOOLS_WEBIDE_CONNECTION_" +
                       action.toUpperCase() + "_USED";
     this._telemetry.log(histogramId, state);
@@ -544,7 +544,7 @@ var UI = {
 
   /** ******** PROJECTS **********/
 
-  openProject: function () {
+  openProject: function() {
     let project = AppManager.selectedProject;
 
     if (!project) {
@@ -611,7 +611,7 @@ var UI = {
   },
 
   // Remember the last selected project on the runtime
-  saveLastSelectedProject: function () {
+  saveLastSelectedProject: function() {
     let shouldRestore = Services.prefs.getBoolPref("devtools.webide.restoreLastProject");
     if (!shouldRestore) {
       return;
@@ -644,7 +644,7 @@ var UI = {
     }
   },
 
-  autoSelectProject: function () {
+  autoSelectProject: function() {
     if (AppManager.selectedProject) {
       return;
     }
@@ -660,7 +660,7 @@ var UI = {
     if (!m) {
       return;
     }
-    let [_, type, project] = m;
+    let [ , type, project] = m;
 
     if (type == "local") {
       let lastProject = AppProjects.get(project);
@@ -695,18 +695,18 @@ var UI = {
 
   /** ******** DECK **********/
 
-  setupDeck: function () {
+  setupDeck: function() {
     let iframes = document.querySelectorAll("#deck > iframe");
     for (let iframe of iframes) {
       iframe.tooltip = "aHTMLTooltip";
     }
   },
 
-  resetFocus: function () {
+  resetFocus: function() {
     document.commandDispatcher.focusedElement = document.documentElement;
   },
 
-  selectDeckPanel: function (id) {
+  selectDeckPanel: function(id) {
     let deck = document.querySelector("#deck");
     if (deck.selectedPanel && deck.selectedPanel.id === "deck-panel-" + id) {
       // This panel is already displayed.
@@ -722,7 +722,7 @@ var UI = {
     deck.selectedPanel = panel;
   },
 
-  resetDeck: function () {
+  resetDeck: function() {
     this.resetFocus();
     let deck = document.querySelector("#deck");
     deck.selectedPanel = null;
@@ -756,7 +756,7 @@ var UI = {
    * |toolboxPromise| since someone must be destroying it to reach here,
    * and call our own close method.
    */
-  _onToolboxClosed: function (promise, iframe) {
+  _onToolboxClosed: function(promise, iframe) {
     // Only save toolbox size, disable wrench button, workaround focus issue...
     // if we are closing the last toolbox:
     //  - toolboxPromise is nullified by destroyToolbox and is still null here
@@ -777,7 +777,7 @@ var UI = {
     iframe.remove();
   },
 
-  destroyToolbox: function () {
+  destroyToolbox: function() {
     // Only have a live toolbox if |this.toolboxPromise| exists
     if (this.toolboxPromise) {
       let toolboxPromise = this.toolboxPromise;
@@ -787,7 +787,7 @@ var UI = {
     return promise.resolve();
   },
 
-  createToolbox: function () {
+  createToolbox: function() {
     // If |this.toolboxPromise| exists, there is already a live toolbox
     if (this.toolboxPromise) {
       return this.toolboxPromise;
@@ -815,7 +815,7 @@ var UI = {
     return this.busyUntil(this.toolboxPromise, "opening toolbox");
   },
 
-  _showToolbox: function (target, iframe) {
+  _showToolbox: function(target, iframe) {
     let splitter = document.querySelector(".devtools-horizontal-splitter");
     splitter.removeAttribute("hidden");
 
@@ -832,29 +832,29 @@ var UI = {
 EventEmitter.decorate(UI);
 
 var Cmds = {
-  quit: function () {
+  quit: function() {
     window.close();
   },
 
-  showProjectPanel: function () {
+  showProjectPanel: function() {
     ProjectPanel.toggleSidebar();
     return promise.resolve();
   },
 
-  showRuntimePanel: function () {
+  showRuntimePanel: function() {
     RuntimeScanners.scan();
     RuntimePanel.toggleSidebar();
   },
 
-  disconnectRuntime: function () {
-    let disconnecting = (async function () {
+  disconnectRuntime: function() {
+    let disconnecting = (async function() {
       await UI.destroyToolbox();
       await AppManager.disconnectRuntime();
     })();
     return UI.busyUntil(disconnecting, "disconnecting from runtime");
   },
 
-  takeScreenshot: function () {
+  takeScreenshot: function() {
     let url = AppManager.deviceFront.screenshotToDataURL();
     return UI.busyUntil(url.then(longstr => {
       return longstr.string().then(dataURL => {
@@ -864,11 +864,11 @@ var Cmds = {
     }), "taking screenshot");
   },
 
-  showRuntimeDetails: function () {
+  showRuntimeDetails: function() {
     UI.selectDeckPanel("runtimedetails");
   },
 
-  showDevicePrefs: function () {
+  showDevicePrefs: function() {
     UI.selectDeckPanel("devicepreferences");
   },
 
@@ -897,51 +897,50 @@ var Cmds = {
     return busy;
   },
 
-  stop: function () {
+  stop: function() {
     return UI.busyUntil(AppManager.stopRunningApp(), "stopping app");
   },
 
-  toggleToolbox: function () {
+  toggleToolbox: function() {
     UI.onAction("debug");
     if (UI.toolboxPromise) {
       UI.destroyToolbox();
       return promise.resolve();
-    } else {
-      return UI.createToolbox();
     }
+    return UI.createToolbox();
   },
 
-  removeProject: function () {
+  removeProject: function() {
     AppManager.removeSelectedProject();
   },
 
-  showTroubleShooting: function () {
+  showTroubleShooting: function() {
     UI.openInBrowser(HELP_URL);
   },
 
-  showAddons: function () {
+  showAddons: function() {
     UI.selectDeckPanel("addons");
   },
 
-  showPrefs: function () {
+  showPrefs: function() {
     UI.selectDeckPanel("prefs");
   },
 
-  zoomIn: function () {
+  zoomIn: function() {
     if (UI.contentViewer.fullZoom < MAX_ZOOM) {
       UI.contentViewer.fullZoom += 0.1;
       Services.prefs.setCharPref("devtools.webide.zoom", UI.contentViewer.fullZoom);
     }
   },
 
-  zoomOut: function () {
+  zoomOut: function() {
     if (UI.contentViewer.fullZoom > MIN_ZOOM) {
       UI.contentViewer.fullZoom -= 0.1;
       Services.prefs.setCharPref("devtools.webide.zoom", UI.contentViewer.fullZoom);
     }
   },
 
-  resetZoom: function () {
+  resetZoom: function() {
     UI.contentViewer.fullZoom = 1;
     Services.prefs.setCharPref("devtools.webide.zoom", 1);
   }
diff --git a/devtools/client/webide/content/wifi-auth.js b/devtools/client/webide/content/wifi-auth.js
index 49da3511a616..ee3030410a18 100644
--- a/devtools/client/webide/content/wifi-auth.js
+++ b/devtools/client/webide/content/wifi-auth.js
@@ -6,10 +6,9 @@
 
 const { require } =
   ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
-const Services = require("Services");
 const QR = require("devtools/shared/qrcode/index");
 
-window.addEventListener("load", function () {
+window.addEventListener("load", function() {
   document.getElementById("close").onclick = () => window.close();
   document.getElementById("no-scanner").onclick = showToken;
   document.getElementById("yes-scanner").onclick = hideToken;
diff --git a/devtools/client/webide/modules/addons.js b/devtools/client/webide/modules/addons.js
index b757e4d6c334..b4418d054583 100644
--- a/devtools/client/webide/modules/addons.js
+++ b/devtools/client/webide/modules/addons.js
@@ -6,7 +6,6 @@
 
 const {AddonManager} = require("resource://gre/modules/AddonManager.jsm");
 const Services = require("Services");
-const {getJSON} = require("devtools/client/shared/getjson");
 const EventEmitter = require("devtools/shared/event-emitter");
 
 var ADB_LINK = Services.prefs.getCharPref("devtools.webide.adbAddonURL");
@@ -37,7 +36,7 @@ addonsListener.onUninstalled = (updatedAddon) => {
 AddonManager.addAddonListener(addonsListener);
 
 var AvailableAddons = null;
-var GetAvailableAddons = exports.GetAvailableAddons = function () {
+var GetAvailableAddons = exports.GetAvailableAddons = function() {
   if (!AvailableAddons) {
     AvailableAddons = {
       adb: new ADBAddon()
@@ -46,7 +45,7 @@ var GetAvailableAddons = exports.GetAvailableAddons = function () {
   return AvailableAddons;
 };
 
-exports.ForgetAddonsList = function () {
+exports.ForgetAddonsList = function() {
   AvailableAddons = null;
 };
 
@@ -63,7 +62,7 @@ Addon.prototype = {
     return this._status;
   },
 
-  updateInstallStatus: function () {
+  updateInstallStatus: function() {
     AddonManager.getAddonByID(this.addonID, (addon) => {
       if (addon && !addon.userDisabled) {
         this.status = "installed";
@@ -73,7 +72,7 @@ Addon.prototype = {
     });
   },
 
-  install: function () {
+  install: function() {
     AddonManager.getAddonByID(this.addonID, (addon) => {
       if (addon && !addon.userDisabled) {
         this.status = "installed";
@@ -91,26 +90,26 @@ Addon.prototype = {
     });
   },
 
-  uninstall: function () {
+  uninstall: function() {
     AddonManager.getAddonByID(this.addonID, (addon) => {
       addon.uninstall();
     });
   },
 
-  installFailureHandler: function (install, message) {
+  installFailureHandler: function(install, message) {
     this.status = "uninstalled";
     this.emit("failure", message);
   },
 
-  onDownloadStarted: function () {
+  onDownloadStarted: function() {
     this.status = "downloading";
   },
 
-  onInstallStarted: function () {
+  onInstallStarted: function() {
     this.status = "installing";
   },
 
-  onDownloadProgress: function (install) {
+  onDownloadProgress: function(install) {
     if (install.maxProgress == -1) {
       this.emit("progress", -1);
     } else {
@@ -118,20 +117,20 @@ Addon.prototype = {
     }
   },
 
-  onInstallEnded: function ({addon}) {
+  onInstallEnded: function({addon}) {
     addon.userDisabled = false;
   },
 
-  onDownloadCancelled: function (install) {
+  onDownloadCancelled: function(install) {
     this.installFailureHandler(install, "Download cancelled");
   },
-  onDownloadFailed: function (install) {
+  onDownloadFailed: function(install) {
     this.installFailureHandler(install, "Download failed");
   },
-  onInstallCancelled: function (install) {
+  onInstallCancelled: function(install) {
     this.installFailureHandler(install, "Install cancelled");
   },
-  onInstallFailed: function (install) {
+  onInstallFailed: function(install) {
     this.installFailureHandler(install, "Install failed");
   },
 };
diff --git a/devtools/client/webide/modules/app-manager.js b/devtools/client/webide/modules/app-manager.js
index 3d0394498c36..710ceefff9f1 100644
--- a/devtools/client/webide/modules/app-manager.js
+++ b/devtools/client/webide/modules/app-manager.js
@@ -2,8 +2,6 @@
  * 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/. */
 
-const {Cu} = require("chrome");
-
 const {TargetFactory} = require("devtools/client/framework/target");
 const Services = require("Services");
 const {FileUtils} = require("resource://gre/modules/FileUtils.jsm");
@@ -28,7 +26,7 @@ var AppManager = exports.AppManager = {
 
   _initialized: false,
 
-  init: function () {
+  init: function() {
     if (this._initialized) {
       return;
     }
@@ -56,7 +54,7 @@ var AppManager = exports.AppManager = {
     this._telemetry = new Telemetry();
   },
 
-  destroy: function () {
+  destroy: function() {
     if (!this._initialized) {
       return;
     }
@@ -122,12 +120,12 @@ var AppManager = exports.AppManager = {
    *     has changed.  This event includes |type| in the details, to distinguish
    *     "apps" and "tabs".
    */
-  update: function (what, details) {
+  update: function(what, details) {
     // Anything we want to forward to the UI
     this.emit("app-manager-update", what, details);
   },
 
-  reportError: function (l10nProperty, ...l10nArgs) {
+  reportError: function(l10nProperty, ...l10nArgs) {
     let win = Services.wm.getMostRecentWindow("devtools:webide");
     if (win) {
       win.UI.reportError(l10nProperty, ...l10nArgs);
@@ -142,7 +140,7 @@ var AppManager = exports.AppManager = {
     }
   },
 
-  onConnectionChanged: function () {
+  onConnectionChanged: function() {
     console.log("Connection status changed: " + this.connection.status);
 
     if (this.connection.status == Connection.Status.DISCONNECTED) {
@@ -170,12 +168,11 @@ var AppManager = exports.AppManager = {
   get apps() {
     if (this._appsFront) {
       return this._appsFront.apps;
-    } else {
-      return new Map();
     }
+    return new Map();
   },
 
-  isProjectRunning: function () {
+  isProjectRunning: function() {
     if (this.selectedProject.type == "mainProcess" ||
         this.selectedProject.type == "tab") {
       return true;
@@ -185,7 +182,7 @@ var AppManager = exports.AppManager = {
     return app && app.running;
   },
 
-  checkIfProjectIsRunning: function () {
+  checkIfProjectIsRunning: function() {
     if (this.selectedProject) {
       if (this.isProjectRunning()) {
         this.update("project-started");
@@ -195,16 +192,16 @@ var AppManager = exports.AppManager = {
     }
   },
 
-  listTabs: function () {
+  listTabs: function() {
     return this.tabStore.listTabs();
   },
 
-  onTabList: function () {
+  onTabList: function() {
     this.update("runtime-targets", { type: "tabs" });
   },
 
   // TODO: Merge this into TabProject as part of project-agnostic work
-  onTabNavigate: function () {
+  onTabNavigate: function() {
     this.update("runtime-targets", { type: "tabs" });
     if (this.selectedProject.type !== "tab") {
       return;
@@ -226,14 +223,14 @@ var AppManager = exports.AppManager = {
     this.update("project-validated");
   },
 
-  onTabClosed: function () {
+  onTabClosed: function() {
     if (this.selectedProject.type !== "tab") {
       return;
     }
     this.selectedProject = null;
   },
 
-  reloadTab: function () {
+  reloadTab: function() {
     if (this.selectedProject && this.selectedProject.type != "tab") {
       return Promise.reject("tried to reload non-tab project");
     }
@@ -242,7 +239,7 @@ var AppManager = exports.AppManager = {
     }, console.error);
   },
 
-  getTarget: function () {
+  getTarget: function() {
     if (this.selectedProject.type == "mainProcess") {
       // Fx >=39 exposes a ChromeActor to debug the main process
       if (this.connection.client.mainRoot.traits.allowChromeProcess) {
@@ -254,15 +251,14 @@ var AppManager = exports.AppManager = {
                        chrome: true
                      });
                    });
-      } else {
+      }
         // Fx <39 exposes tab actors on the root actor
-        return TargetFactory.forRemoteTab({
+      return TargetFactory.forRemoteTab({
           form: this._listTabsResponse,
           client: this.connection.client,
           chrome: true,
           isTabActor: false
-        });
-      }
+      });
     }
 
     if (this.selectedProject.type == "tab") {
@@ -274,7 +270,7 @@ var AppManager = exports.AppManager = {
       return Promise.reject("Can't find app front for selected project");
     }
 
-    return (async function () {
+    return (async function() {
       // Once we asked the app to launch, the app isn't necessary completely loaded.
       // launch request only ask the app to launch and immediatly returns.
       // We have to keep trying to get app tab actors required to create its target.
@@ -293,7 +289,7 @@ var AppManager = exports.AppManager = {
     })();
   },
 
-  getProjectManifestURL: function (project) {
+  getProjectManifestURL: function(project) {
     let manifest = null;
     if (project.type == "runtimeApp") {
       manifest = project.app.manifestURL;
@@ -310,7 +306,7 @@ var AppManager = exports.AppManager = {
     return manifest;
   },
 
-  _getProjectFront: function (project) {
+  _getProjectFront: function(project) {
     let manifest = this.getProjectManifestURL(project);
     if (manifest && this._appsFront) {
       return this._appsFront.apps.get(manifest);
@@ -346,7 +342,9 @@ var AppManager = exports.AppManager = {
     }
 
     let cancelled = false;
-    this.update("before-project", { cancel: () => { cancelled = true; } });
+    this.update("before-project", { cancel: () => {
+      cancelled = true;
+    } });
     if (cancelled) {
       return;
     }
@@ -401,8 +399,7 @@ var AppManager = exports.AppManager = {
     return this._selectedRuntime;
   },
 
-  connectToRuntime: function (runtime) {
-
+  connectToRuntime: function(runtime) {
     if (this.connected && this.selectedRuntime === runtime) {
       // Already connected
       return Promise.resolve();
@@ -489,7 +486,7 @@ var AppManager = exports.AppManager = {
     this.update("runtime-telemetry");
   },
 
-  isMainProcessDebuggable: function () {
+  isMainProcessDebuggable: function() {
     // Fx <39 exposes chrome tab actors on RootActor
     // Fx >=39 exposes a dedicated actor via getProcess request
     return this.connection.client &&
@@ -517,7 +514,7 @@ var AppManager = exports.AppManager = {
     return getPreferenceFront(this.connection.client, this._listTabsResponse);
   },
 
-  disconnectRuntime: function () {
+  disconnectRuntime: function() {
     if (!this.connected) {
       return Promise.resolve();
     }
@@ -528,7 +525,7 @@ var AppManager = exports.AppManager = {
     });
   },
 
-  launchRuntimeApp: function () {
+  launchRuntimeApp: function() {
     if (this.selectedProject && this.selectedProject.type != "runtimeApp") {
       return Promise.reject("attempting to launch a non-runtime app");
     }
@@ -536,23 +533,22 @@ var AppManager = exports.AppManager = {
     return app.launch();
   },
 
-  launchOrReloadRuntimeApp: function () {
+  launchOrReloadRuntimeApp: function() {
     if (this.selectedProject && this.selectedProject.type != "runtimeApp") {
       return Promise.reject("attempting to launch / reload a non-runtime app");
     }
     let app = this._getProjectFront(this.selectedProject);
     if (!app.running) {
       return app.launch();
-    } else {
-      return app.reload();
     }
+    return app.reload();
   },
 
-  runtimeCanHandleApps: function () {
+  runtimeCanHandleApps: function() {
     return !!this._appsFront;
   },
 
-  installAndRunProject: function () {
+  installAndRunProject: function() {
     let project = this.selectedProject;
 
     if (!project || (project.type != "packaged" && project.type != "hosted")) {
@@ -570,7 +566,7 @@ var AppManager = exports.AppManager = {
       return Promise.reject("Can't install");
     }
 
-    return (async function () {
+    return (async function() {
       let self = AppManager;
 
       // Validate project
@@ -581,8 +577,6 @@ var AppManager = exports.AppManager = {
         return;
       }
 
-      let installPromise;
-
       if (project.type != "packaged" && project.type != "hosted") {
         return Promise.reject("Don't know how to install project");
       }
@@ -639,20 +633,19 @@ var AppManager = exports.AppManager = {
     })();
   },
 
-  stopRunningApp: function () {
+  stopRunningApp: function() {
     let app = this._getProjectFront(this.selectedProject);
     return app.close();
   },
 
   /* PROJECT VALIDATION */
 
-  validateAndUpdateProject: function (project) {
+  validateAndUpdateProject: function(project) {
     if (!project) {
       return Promise.reject();
     }
 
-    return (async function () {
-
+    return (async function() {
       let packageDir = project.location;
       let validation = new AppValidator({
         type: project.type,
@@ -673,16 +666,14 @@ var AppManager = exports.AppManager = {
         }
         if (!iconPath) {
           project.icon = AppManager.DEFAULT_PROJECT_ICON;
-        } else {
-          if (project.type == "hosted") {
-            let manifestURL = Services.io.newURI(project.location);
-            let origin = Services.io.newURI(manifestURL.prePath);
-            project.icon = Services.io.newURI(iconPath, null, origin).spec;
-          } else if (project.type == "packaged") {
-            let projectFolder = FileUtils.File(packageDir);
-            let folderURI = Services.io.newFileURI(projectFolder).spec;
-            project.icon = folderURI + iconPath.replace(/^\/|\\/, "");
-          }
+        } else if (project.type == "hosted") {
+          let manifestURL = Services.io.newURI(project.location);
+          let origin = Services.io.newURI(manifestURL.prePath);
+          project.icon = Services.io.newURI(iconPath, null, origin).spec;
+        } else if (project.type == "packaged") {
+          let projectFolder = FileUtils.File(packageDir);
+          let folderURI = Services.io.newFileURI(projectFolder).spec;
+          project.icon = folderURI + iconPath.replace(/^\/|\\/, "");
         }
         project.manifest = validation.manifest;
 
@@ -735,7 +726,7 @@ var AppManager = exports.AppManager = {
 
   /* RUNTIME LIST */
 
-  _clearRuntimeList: function () {
+  _clearRuntimeList: function() {
     this.runtimeList = {
       usb: [],
       wifi: [],
@@ -743,7 +734,7 @@ var AppManager = exports.AppManager = {
     };
   },
 
-  _rebuildRuntimeList: function () {
+  _rebuildRuntimeList: function() {
     let runtimes = RuntimeScanners.listRuntimes();
     this._clearRuntimeList();
 
@@ -767,7 +758,7 @@ var AppManager = exports.AppManager = {
 
   /* MANIFEST UTILS */
 
-  writeManifest: function (project) {
+  writeManifest: function(project) {
     if (project.type != "packaged") {
       return Promise.reject("Not a packaged app");
     }
diff --git a/devtools/client/webide/modules/app-projects.js b/devtools/client/webide/modules/app-projects.js
index 167463178321..76687357a207 100644
--- a/devtools/client/webide/modules/app-projects.js
+++ b/devtools/client/webide/modules/app-projects.js
@@ -2,7 +2,7 @@
  * 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/. */
 
-const {Cc, Ci, Cu, Cr} = require("chrome");
+const {Cc, Ci, Cr} = require("chrome");
 
 const EventEmitter = require("devtools/shared/event-emitter");
 const {generateUUID} = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);
@@ -19,35 +19,33 @@ const IDB = {
   _db: null,
   databaseName: "AppProjects",
 
-  open: function () {
+  open: function() {
     return new Promise((resolve, reject) => {
       let request = indexedDB.open(IDB.databaseName, 5);
-      request.onerror = function (event) {
+      request.onerror = function(event) {
         reject("Unable to open AppProjects indexedDB: " +
                         this.error.name + " - " + this.error.message);
       };
-      request.onupgradeneeded = function (event) {
+      request.onupgradeneeded = function(event) {
         let db = event.target.result;
         db.createObjectStore("projects", { keyPath: "location" });
       };
 
-      request.onsuccess = function () {
+      request.onsuccess = function() {
         let db = IDB._db = request.result;
         let objectStore = db.transaction("projects").objectStore("projects");
         let projects = [];
         let toRemove = [];
-        objectStore.openCursor().onsuccess = function (event) {
+        objectStore.openCursor().onsuccess = function(event) {
           let cursor = event.target.result;
           if (cursor) {
             if (cursor.value.location) {
-
               // We need to make sure this object has a `.location` property.
               // The UI depends on this property.
               // This should not be needed as we make sure to register valid
               // projects, but in the past (before bug 924568), we might have
               // registered invalid objects.
 
-
               // We also want to make sure the location is valid.
               // If the location doesn't exist, we remove the project.
 
@@ -80,7 +78,7 @@ const IDB = {
     });
   },
 
-  add: function (project) {
+  add: function(project) {
     return new Promise((resolve, reject) => {
       if (!project.location) {
         // We need to make sure this object has a `.location` property.
@@ -89,41 +87,41 @@ const IDB = {
         let transaction = IDB._db.transaction(["projects"], "readwrite");
         let objectStore = transaction.objectStore("projects");
         let request = objectStore.add(project);
-        request.onerror = function (event) {
+        request.onerror = function(event) {
           reject("Unable to add project to the AppProjects indexedDB: " +
                  this.error.name + " - " + this.error.message);
         };
-        request.onsuccess = function () {
+        request.onsuccess = function() {
           resolve();
         };
       }
     });
   },
 
-  update: function (project) {
+  update: function(project) {
     return new Promise((resolve, reject) => {
-      var transaction = IDB._db.transaction(["projects"], "readwrite");
-      var objectStore = transaction.objectStore("projects");
-      var request = objectStore.put(project);
-      request.onerror = function (event) {
+      let transaction = IDB._db.transaction(["projects"], "readwrite");
+      let objectStore = transaction.objectStore("projects");
+      let request = objectStore.put(project);
+      request.onerror = function(event) {
         reject("Unable to update project to the AppProjects indexedDB: " +
                this.error.name + " - " + this.error.message);
       };
-      request.onsuccess = function () {
+      request.onsuccess = function() {
         resolve();
       };
     });
   },
 
-  remove: function (location) {
+  remove: function(location) {
     return new Promise((resolve, reject) => {
       let request = IDB._db.transaction(["projects"], "readwrite")
                     .objectStore("projects")
                     .delete(location);
-      request.onsuccess = function (event) {
+      request.onsuccess = function(event) {
         resolve();
       };
-      request.onerror = function () {
+      request.onerror = function() {
         reject("Unable to delete project to the AppProjects indexedDB: " +
                this.error.name + " - " + this.error.message);
       };
@@ -131,17 +129,17 @@ const IDB = {
   }
 };
 
-var loadDeferred = IDB.open().then(function (projects) {
+var loadDeferred = IDB.open().then(function(projects) {
   AppProjects.projects = projects;
   AppProjects.emit("ready", projects);
 });
 
 const AppProjects = {
-  load: function () {
+  load: function() {
     return loadDeferred;
   },
 
-  addPackaged: function (folder) {
+  addPackaged: function(folder) {
     let file = FileUtils.File(folder.path);
     if (!file.exists()) {
       return Promise.reject("path doesn't exist");
@@ -168,7 +166,7 @@ const AppProjects = {
     });
   },
 
-  addHosted: function (manifestURL) {
+  addHosted: function(manifestURL) {
     let existingProject = this.get(manifestURL);
     if (existingProject) {
       return Promise.reject("Already added");
@@ -183,11 +181,11 @@ const AppProjects = {
     });
   },
 
-  update: function (project) {
+  update: function(project) {
     return IDB.update(project);
   },
 
-  updateLocation: function (project, newLocation) {
+  updateLocation: function(project, newLocation) {
     return IDB.remove(project.location)
               .then(() => {
                 project.location = newLocation;
@@ -195,7 +193,7 @@ const AppProjects = {
               });
   },
 
-  remove: function (location) {
+  remove: function(location) {
     return IDB.remove(location).then(() => {
       for (let i = 0; i < this.projects.length; i++) {
         if (this.projects[i].location == location) {
@@ -207,7 +205,7 @@ const AppProjects = {
     });
   },
 
-  get: function (location) {
+  get: function(location) {
     for (let i = 0; i < this.projects.length; i++) {
       if (this.projects[i].location == location) {
         return this.projects[i];
diff --git a/devtools/client/webide/modules/app-validator.js b/devtools/client/webide/modules/app-validator.js
index ad6c7f40ae87..55f81ad2fd69 100644
--- a/devtools/client/webide/modules/app-validator.js
+++ b/devtools/client/webide/modules/app-validator.js
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-var {Ci, Cu} = require("chrome");
+var {Ci} = require("chrome");
 
 const {FileUtils} = require("resource://gre/modules/FileUtils.jsm");
 const Services = require("Services");
@@ -16,15 +16,15 @@ function AppValidator({ type, location }) {
   this.warnings = [];
 }
 
-AppValidator.prototype.error = function (message) {
+AppValidator.prototype.error = function(message) {
   this.errors.push(message);
 };
 
-AppValidator.prototype.warning = function (message) {
+AppValidator.prototype.warning = function(message) {
   this.warnings.push(message);
 };
 
-AppValidator.prototype._getPackagedManifestFile = function () {
+AppValidator.prototype._getPackagedManifestFile = function() {
   let manifestFile = FileUtils.File(this.location);
   if (!manifestFile.exists()) {
     this.error(strings.GetStringFromName("validator.nonExistingFolder"));
@@ -52,7 +52,7 @@ AppValidator.prototype._getPackagedManifestFile = function () {
   return hasAppManifest ? appManifestFile : jsonManifestFile;
 };
 
-AppValidator.prototype._getPackagedManifestURL = function () {
+AppValidator.prototype._getPackagedManifestURL = function() {
   let manifestFile = this._getPackagedManifestFile();
   if (!manifestFile) {
     return null;
@@ -60,7 +60,7 @@ AppValidator.prototype._getPackagedManifestURL = function () {
   return Services.io.newFileURI(manifestFile).spec;
 };
 
-AppValidator.checkManifest = function (manifestURL) {
+AppValidator.checkManifest = function(manifestURL) {
   return new Promise((resolve, reject) => {
     let error;
 
@@ -75,7 +75,7 @@ AppValidator.checkManifest = function (manifestURL) {
       return reject(error);
     }
 
-    req.onload = function () {
+    req.onload = function() {
       let manifest = null;
       try {
         manifest = JSON.parse(req.responseText);
@@ -87,7 +87,7 @@ AppValidator.checkManifest = function (manifestURL) {
       resolve({manifest, manifestURL});
     };
 
-    req.onerror = function () {
+    req.onerror = function() {
       error = strings.formatStringFromName("validator.noAccessManifestURL", [req.statusText, manifestURL], 2);
       reject(error);
     };
@@ -101,12 +101,12 @@ AppValidator.checkManifest = function (manifestURL) {
   });
 };
 
-AppValidator.findManifestAtOrigin = function (manifestURL) {
+AppValidator.findManifestAtOrigin = function(manifestURL) {
   let fixedManifest = Services.io.newURI(manifestURL).prePath + "/manifest.webapp";
   return AppValidator.checkManifest(fixedManifest);
 };
 
-AppValidator.findManifestPath = function (manifestURL) {
+AppValidator.findManifestPath = function(manifestURL) {
   return new Promise((resolve, reject) => {
     if (manifestURL.endsWith("manifest.webapp")) {
       reject();
@@ -117,8 +117,8 @@ AppValidator.findManifestPath = function (manifestURL) {
   });
 };
 
-AppValidator.checkAlternateManifest = function (manifestURL) {
-  return (async function () {
+AppValidator.checkAlternateManifest = function(manifestURL) {
+  return (async function() {
     let result;
     try {
       result = await AppValidator.findManifestPath(manifestURL);
@@ -130,7 +130,7 @@ AppValidator.checkAlternateManifest = function (manifestURL) {
   })();
 };
 
-AppValidator.prototype._fetchManifest = function (manifestURL) {
+AppValidator.prototype._fetchManifest = function(manifestURL) {
   return new Promise(resolve => {
     this.manifestURL = manifestURL;
 
@@ -150,12 +150,13 @@ AppValidator.prototype._fetchManifest = function (manifestURL) {
   });
 };
 
-AppValidator.prototype._getManifest = function () {
+AppValidator.prototype._getManifest = function() {
   let manifestURL;
   if (this.type == "packaged") {
     manifestURL = this._getPackagedManifestURL();
-    if (!manifestURL)
+    if (!manifestURL) {
       return Promise.resolve(null);
+    }
   } else if (this.type == "hosted") {
     manifestURL = this.location;
     try {
@@ -171,7 +172,7 @@ AppValidator.prototype._getManifest = function () {
   return this._fetchManifest(manifestURL);
 };
 
-AppValidator.prototype.validateManifest = function (manifest) {
+AppValidator.prototype.validateManifest = function(manifest) {
   if (!manifest.name) {
     this.error(strings.GetStringFromName("validator.missNameManifestProperty"));
   }
@@ -183,7 +184,7 @@ AppValidator.prototype.validateManifest = function (manifest) {
   }
 };
 
-AppValidator.prototype._getOriginURL = function () {
+AppValidator.prototype._getOriginURL = function() {
   if (this.type == "packaged") {
     let manifestURL = Services.io.newURI(this.manifestURL);
     return Services.io.newURI(".", null, manifestURL).spec;
@@ -192,7 +193,7 @@ AppValidator.prototype._getOriginURL = function () {
   }
 };
 
-AppValidator.prototype.validateLaunchPath = function (manifest) {
+AppValidator.prototype.validateLaunchPath = function(manifest) {
   return new Promise(resolve => {
     // The launch_path field has to start with a `/`
     if (manifest.launch_path && manifest.launch_path[0] !== "/") {
@@ -224,8 +225,9 @@ AppValidator.prototype.validateLaunchPath = function (manifest) {
       return resolve();
     }
     req.onload = () => {
-      if (req.status >= 400)
+      if (req.status >= 400) {
         this.error(strings.formatStringFromName("validator.accessFailedLaunchPathBadHttpCode", [indexURL, req.status], 2));
+      }
       resolve();
     };
     req.onerror = () => {
@@ -242,7 +244,7 @@ AppValidator.prototype.validateLaunchPath = function (manifest) {
   });
 };
 
-AppValidator.prototype.validateType = function (manifest) {
+AppValidator.prototype.validateType = function(manifest) {
   let appType = manifest.type || "web";
   if (!["web", "privileged", "certified"].includes(appType)) {
     this.error(strings.formatStringFromName("validator.invalidAppType", [appType], 1));
@@ -257,11 +259,11 @@ AppValidator.prototype.validateType = function (manifest) {
   }
 };
 
-AppValidator.prototype.validate = function () {
+AppValidator.prototype.validate = function() {
   this.errors = [];
   this.warnings = [];
-  return this._getManifest().
-    then((manifest) => {
+  return this._getManifest()
+    .then((manifest) => {
       if (manifest) {
         this.manifest = manifest;
 
diff --git a/devtools/client/webide/modules/config-view.js b/devtools/client/webide/modules/config-view.js
index 31f2a2ae4c99..285fb24fe578 100644
--- a/devtools/client/webide/modules/config-view.js
+++ b/devtools/client/webide/modules/config-view.js
@@ -2,15 +2,13 @@
  * 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/. */
 
-const {Cu} = require("chrome");
-
 const EventEmitter = require("devtools/shared/event-emitter");
 const Services = require("Services");
 const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties");
 
 var ConfigView;
 
-module.exports = ConfigView = function (window) {
+module.exports = ConfigView = function(window) {
   EventEmitter.decorate(this);
   this._doc = window.document;
   this._keys = [];
@@ -18,7 +16,7 @@ module.exports = ConfigView = function (window) {
 };
 
 ConfigView.prototype = {
-  _renderByType: function (input, name, value, customType) {
+  _renderByType: function(input, name, value, customType) {
     value = customType || typeof value;
 
     switch (value) {
@@ -62,7 +60,7 @@ ConfigView.prototype = {
     this._includeTypeName = include;
   },
 
-  search: function (event) {
+  search: function(event) {
     if (event.target.value.length) {
       let stringMatch = new RegExp(event.target.value, "i");
 
@@ -76,7 +74,7 @@ ConfigView.prototype = {
         }
       }
     } else {
-      var trs = this._doc.getElementById("device-fields").querySelectorAll("tr");
+      let trs = this._doc.getElementById("device-fields").querySelectorAll("tr");
 
       for (let i = 0; i < trs.length; i++) {
         trs[i].classList.remove("hide");
@@ -84,7 +82,7 @@ ConfigView.prototype = {
     }
   },
 
-  generateDisplay: function (json) {
+  generateDisplay: function(json) {
     let deviceItems = Object.keys(json);
     deviceItems.sort();
     this.keys = deviceItems;
@@ -94,7 +92,7 @@ ConfigView.prototype = {
     }
   },
 
-  generateField: function (name, value, hasUserValue, customType, newRow) {
+  generateField: function(name, value, hasUserValue, customType, newRow) {
     let table = this._doc.querySelector("table");
     let sResetDefault = Strings.GetStringFromName("device_reset_default");
 
@@ -160,18 +158,18 @@ ConfigView.prototype = {
     }
   },
 
-  resetTable: function () {
+  resetTable: function() {
     let table = this._doc.querySelector("table");
     let trs = table.querySelectorAll("tr:not(#add-custom-field)");
 
-    for (var i = 0; i < trs.length; i++) {
+    for (let i = 0; i < trs.length; i++) {
       table.removeChild(trs[i]);
     }
 
     return table;
   },
 
-  _getCallType: function (type, name) {
+  _getCallType: function(type, name) {
     let frontName = "get";
 
     if (this._includeTypeName) {
@@ -181,7 +179,7 @@ ConfigView.prototype = {
     return this._front[frontName + this._kind](name);
   },
 
-  _setCallType: function (type, name, value) {
+  _setCallType: function(type, name, value) {
     let frontName = "set";
 
     if (this._includeTypeName) {
@@ -191,7 +189,7 @@ ConfigView.prototype = {
     return this._front[frontName + this._kind](name, value);
   },
 
-  _saveByType: function (options) {
+  _saveByType: function(options) {
     let fieldName = options.id;
     let inputType = options.type;
     let value = options.value;
@@ -216,7 +214,7 @@ ConfigView.prototype = {
     }
   },
 
-  updateField: function (event) {
+  updateField: function(event) {
     if (event.target) {
       let inputType = event.target.getAttribute("data-type");
       let inputValue = event.target.checked || event.target.value;
@@ -243,7 +241,7 @@ ConfigView.prototype = {
     }
   },
 
-  _resetToDefault: function (name, input, button) {
+  _resetToDefault: function(name, input, button) {
     this._front["clearUser" + this._kind](name);
     let dataType = input.getAttribute("data-type");
     let tr = this._doc.getElementById("row-" + name);
@@ -287,7 +285,7 @@ ConfigView.prototype = {
     button.classList.add("hide");
   },
 
-  checkReset: function (event) {
+  checkReset: function(event) {
     if (event.target.classList.contains("reset")) {
       let btnId = event.target.getAttribute("data-id");
       let input = this._doc.getElementById(btnId);
@@ -295,11 +293,10 @@ ConfigView.prototype = {
     }
   },
 
-  updateFieldType: function () {
+  updateFieldType: function() {
     let table = this._doc.querySelector("table");
     let customValueType = table.querySelector("#custom-value-type").value;
     let customTextEl = table.querySelector("#custom-value-text");
-    let customText = customTextEl.value;
 
     if (customValueType.length === 0) {
       return false;
@@ -308,10 +305,8 @@ ConfigView.prototype = {
     switch (customValueType) {
       case "boolean":
         customTextEl.type = "checkbox";
-        customText = customTextEl.checked;
         break;
       case "number":
-        customText = parseInt(customText, 10) || 0;
         customTextEl.type = "number";
         break;
       default:
@@ -322,7 +317,7 @@ ConfigView.prototype = {
     return customValueType;
   },
 
-  clearNewFields: function () {
+  clearNewFields: function() {
     let table = this._doc.querySelector("table");
     let customTextEl = table.querySelector("#custom-value-text");
     if (customTextEl.checked) {
@@ -334,7 +329,7 @@ ConfigView.prototype = {
     this.updateFieldType();
   },
 
-  updateNewField: function () {
+  updateNewField: function() {
     let table = this._doc.querySelector("table");
     let customValueType = this.updateFieldType();
 
@@ -365,7 +360,7 @@ ConfigView.prototype = {
     }
   },
 
-  checkNewFieldSubmit: function (event) {
+  checkNewFieldSubmit: function(event) {
     if (event.keyCode === 13) {
       this._doc.getElementById("custom-value").click();
     }
diff --git a/devtools/client/webide/modules/project-list.js b/devtools/client/webide/modules/project-list.js
index 542d927683ca..6414075c5838 100644
--- a/devtools/client/webide/modules/project-list.js
+++ b/devtools/client/webide/modules/project-list.js
@@ -2,8 +2,6 @@
 * 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/. */
 
-const {Cu} = require("chrome");
-
 const Services = require("Services");
 const {AppProjects} = require("devtools/client/webide/modules/app-projects");
 const {AppManager} = require("devtools/client/webide/modules/app-manager");
@@ -15,7 +13,7 @@ const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.p
 
 var ProjectList;
 
-module.exports = ProjectList = function (win, parentWindow) {
+module.exports = ProjectList = function(win, parentWindow) {
   EventEmitter.decorate(this);
   this._doc = win.document;
   this._UI = parentWindow.UI;
@@ -36,7 +34,7 @@ ProjectList.prototype = {
     return this._doc;
   },
 
-  appManagerUpdate: function (what, details) {
+  appManagerUpdate: function(what, details) {
     // Got a message from app-manager.js
     // See AppManager.update() for descriptions of what these events mean.
     switch (what) {
@@ -52,7 +50,7 @@ ProjectList.prototype = {
     }
   },
 
-  onWebIDEUpdate: function (what, details) {
+  onWebIDEUpdate: function(what, details) {
     if (what == "busy" || what == "unbusy") {
       this.updateCommands();
     }
@@ -65,15 +63,16 @@ ProjectList.prototype = {
    *   name: String       name of the app
    * }
    */
-  newApp: function (testOptions) {
+  newApp: function(testOptions) {
     let parentWindow = this._parentWindow;
     let self = this;
-    return this._UI.busyUntil((async function () {
+    return this._UI.busyUntil((async function() {
       // Open newapp.xul, which will feed ret.location
       let ret = {location: null, testOptions: testOptions};
       parentWindow.openDialog("chrome://webide/content/newapp.xul", "newapp", "chrome,modal", ret);
-      if (!ret.location)
+      if (!ret.location) {
         return;
+      }
 
       // Retrieve added project
       let project = AppProjects.get(ret.location);
@@ -85,10 +84,10 @@ ProjectList.prototype = {
     })(), "creating new app");
   },
 
-  importPackagedApp: function (location) {
+  importPackagedApp: function(location) {
     let parentWindow = this._parentWindow;
     let UI = this._UI;
-    return UI.busyUntil((async function () {
+    return UI.busyUntil((async function() {
       let directory = await utils.getPackagedDirectory(parentWindow, location);
 
       if (!directory) {
@@ -100,10 +99,10 @@ ProjectList.prototype = {
     })(), "importing packaged app");
   },
 
-  importHostedApp: function (location) {
+  importHostedApp: function(location) {
     let parentWindow = this._parentWindow;
     let UI = this._UI;
-    return UI.busyUntil((async function () {
+    return UI.busyUntil((async function() {
       let url = utils.getHostedURL(parentWindow, location);
 
       if (!url) {
@@ -121,7 +120,7 @@ ProjectList.prototype = {
    *   icon: String       path of the project icon
    * }
    */
-  _renderProjectItem: function (opts) {
+  _renderProjectItem: function(opts) {
     let span = opts.panel.querySelector("span") || this._doc.createElement("span");
     span.textContent = opts.name;
     let icon = opts.panel.querySelector("img") || this._doc.createElement("img");
@@ -132,7 +131,7 @@ ProjectList.prototype = {
     opts.panel.setAttribute("title", opts.name);
   },
 
-  refreshTabs: function () {
+  refreshTabs: function() {
     if (AppManager.connected) {
       return AppManager.listTabs().then(() => {
         this.updateTabs();
@@ -140,7 +139,7 @@ ProjectList.prototype = {
     }
   },
 
-  updateTabs: function () {
+  updateTabs: function() {
     let tabsHeaderNode = this._doc.querySelector("#panel-header-tabs");
     let tabsNode = this._doc.querySelector("#project-panel-tabs");
 
@@ -200,11 +199,11 @@ ProjectList.prototype = {
     return Promise.resolve();
   },
 
-  updateApps: function () {
+  updateApps: function() {
     let doc = this._doc;
     let runtimeappsHeaderNode = doc.querySelector("#panel-header-runtimeapps");
     let sortedApps = [];
-    for (let [manifestURL, app] of AppManager.apps) {
+    for (let [/* manifestURL */, app] of AppManager.apps) {
       sortedApps.push(app);
     }
     sortedApps = sortedApps.sort((a, b) => {
@@ -263,7 +262,7 @@ ProjectList.prototype = {
     return Promise.resolve();
   },
 
-  updateCommands: function () {
+  updateCommands: function() {
     let doc = this._doc;
     let newAppCmd;
     let packagedAppCmd;
@@ -295,7 +294,7 @@ ProjectList.prototype = {
    *        An |options| object containing a type of |apps| or |tabs| will limit
    *        what is updated to only those sections.
    */
-  update: function (options) {
+  update: function(options) {
     if (options && options.type === "apps") {
       return this.updateApps();
     } else if (options && options.type === "tabs") {
@@ -359,7 +358,7 @@ ProjectList.prototype = {
     });
   },
 
-  destroy: function () {
+  destroy: function() {
     this._doc = null;
     AppManager.off("app-manager-update", this.appManagerUpdate);
     this._UI.off("webide-update", this.onWebIDEUpdate);
diff --git a/devtools/client/webide/modules/runtime-list.js b/devtools/client/webide/modules/runtime-list.js
index f29a7ca9eeac..088b1655f47b 100644
--- a/devtools/client/webide/modules/runtime-list.js
+++ b/devtools/client/webide/modules/runtime-list.js
@@ -4,18 +4,14 @@
 
 "use strict";
 
-const Services = require("Services");
 const {AppManager} = require("devtools/client/webide/modules/app-manager");
 const EventEmitter = require("devtools/shared/event-emitter");
 const {RuntimeScanners, WiFiScanner} = require("devtools/client/webide/modules/runtimes");
 const {Devices} = require("resource://devtools/shared/apps/Devices.jsm");
-const utils = require("devtools/client/webide/modules/utils");
-
-const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties");
 
 var RuntimeList;
 
-module.exports = RuntimeList = function (window, parentWindow) {
+module.exports = RuntimeList = function(window, parentWindow) {
   EventEmitter.decorate(this);
   this._doc = window.document;
   this._UI = parentWindow.UI;
@@ -37,7 +33,7 @@ RuntimeList.prototype = {
     return this._doc;
   },
 
-  appManagerUpdate: function (what, details) {
+  appManagerUpdate: function(what, details) {
     // Got a message from app-manager.js
     // See AppManager.update() for descriptions of what these events mean.
     switch (what) {
@@ -51,41 +47,41 @@ RuntimeList.prototype = {
     }
   },
 
-  onWebIDEUpdate: function (what, details) {
+  onWebIDEUpdate: function(what, details) {
     if (what == "busy" || what == "unbusy") {
       this.updateCommands();
     }
   },
 
-  takeScreenshot: function () {
+  takeScreenshot: function() {
     this._Cmds.takeScreenshot();
   },
 
-  showRuntimeDetails: function () {
+  showRuntimeDetails: function() {
     this._Cmds.showRuntimeDetails();
   },
 
-  showDevicePreferences: function () {
+  showDevicePreferences: function() {
     this._Cmds.showDevicePrefs();
   },
 
-  showSettings: function () {
+  showSettings: function() {
     this._Cmds.showSettings();
   },
 
-  showTroubleShooting: function () {
+  showTroubleShooting: function() {
     this._Cmds.showTroubleShooting();
   },
 
-  showAddons: function () {
+  showAddons: function() {
     this._Cmds.showAddons();
   },
 
-  refreshScanners: function () {
+  refreshScanners: function() {
     RuntimeScanners.scan();
   },
 
-  updateCommands: function () {
+  updateCommands: function() {
     let doc = this._doc;
 
     // Runtime commands
@@ -113,7 +109,7 @@ RuntimeList.prototype = {
     }
   },
 
-  update: function () {
+  update: function() {
     let doc = this._doc;
     let wifiHeaderNode = doc.querySelector("#runtime-header-wifi");
 
@@ -182,7 +178,7 @@ RuntimeList.prototype = {
     }
   },
 
-  destroy: function () {
+  destroy: function() {
     this._doc = null;
     AppManager.off("app-manager-update", this.appManagerUpdate);
     this._UI.off("webide-update", this.onWebIDEUpdate);
diff --git a/devtools/client/webide/modules/runtimes.js b/devtools/client/webide/modules/runtimes.js
index d8c712563427..c3a06c9e4c0b 100644
--- a/devtools/client/webide/modules/runtimes.js
+++ b/devtools/client/webide/modules/runtimes.js
@@ -7,7 +7,6 @@
 const {Ci} = require("chrome");
 const Services = require("Services");
 const {Devices} = require("resource://devtools/shared/apps/Devices.jsm");
-const {Connection} = require("devtools/shared/client/connection-manager");
 const {DebuggerServer} = require("devtools/server/main");
 const discovery = require("devtools/shared/discovery/discovery");
 const EventEmitter = require("devtools/shared/event-emitter");
@@ -214,7 +213,7 @@ var LazyAdbScanner = {
     return promise.resolve();
   },
 
-  listRuntimes: function () {
+  listRuntimes: function() {
     return [];
   }
 
@@ -263,7 +262,7 @@ var WiFiScanner = {
     return promise.resolve();
   },
 
-  listRuntimes: function () {
+  listRuntimes: function() {
     return this._runtimes;
   },
 
@@ -299,7 +298,9 @@ exports.WiFiScanner = WiFiScanner;
 var StaticScanner = {
   enable() {},
   disable() {},
-  scan() { return promise.resolve(); },
+  scan() {
+    return promise.resolve();
+  },
   listRuntimes() {
     let runtimes = [gRemoteRuntime];
     if (Services.prefs.getBoolPref("devtools.webide.enableLocalRuntime")) {
@@ -332,7 +333,7 @@ WiFiRuntime.prototype = {
   type: RuntimeTypes.WIFI,
   // Mark runtime as taking a long time to connect
   prolongedConnection: true,
-  connect: function (connection) {
+  connect: function(connection) {
     let service = discovery.getRemoteService("devtools", this.deviceName);
     if (!service) {
       return promise.reject(new Error("Can't find device: " + this.name));
@@ -392,7 +393,7 @@ WiFiRuntime.prototype = {
       onOpenWindow(xulWindow) {
         let win = xulWindow.QueryInterface(Ci.nsIInterfaceRequestor)
                            .getInterface(Ci.nsIDOMWindow);
-        win.addEventListener("load", function () {
+        win.addEventListener("load", function() {
           if (win.document.documentElement.getAttribute("id") != WINDOW_ID) {
             return;
           }
@@ -435,7 +436,7 @@ exports._WiFiRuntime = WiFiRuntime;
 
 var gLocalRuntime = {
   type: RuntimeTypes.LOCAL,
-  connect: function (connection) {
+  connect: function(connection) {
     DebuggerServer.init();
     DebuggerServer.registerAllActors();
     DebuggerServer.allowChromeProcess = true;
@@ -457,7 +458,7 @@ exports._gLocalRuntime = gLocalRuntime;
 
 var gRemoteRuntime = {
   type: RuntimeTypes.REMOTE,
-  connect: function (connection) {
+  connect: function(connection) {
     let win = Services.wm.getMostRecentWindow("devtools:webide");
     if (!win) {
       return promise.reject(new Error("No WebIDE window found"));
diff --git a/devtools/client/webide/modules/tab-store.js b/devtools/client/webide/modules/tab-store.js
index 034ba37c20db..8d85a2e08d8a 100644
--- a/devtools/client/webide/modules/tab-store.js
+++ b/devtools/client/webide/modules/tab-store.js
@@ -2,8 +2,6 @@
  * 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/. */
 
-const { Cu } = require("chrome");
-
 const { TargetFactory } = require("devtools/client/framework/target");
 const EventEmitter = require("devtools/shared/event-emitter");
 const { Connection } = require("devtools/shared/client/connection-manager");
@@ -12,7 +10,7 @@ const _knownTabStores = new WeakMap();
 
 var TabStore;
 
-module.exports = TabStore = function (connection) {
+module.exports = TabStore = function(connection) {
   // If we already know about this connection,
   // let's re-use the existing store.
   if (_knownTabStores.has(connection)) {
@@ -39,7 +37,7 @@ module.exports = TabStore = function (connection) {
 
 TabStore.prototype = {
 
-  destroy: function () {
+  destroy: function() {
     if (this._connection) {
       // While this.destroy is bound using .once() above, that event may not
       // have occurred when the TabStore client calls destroy, so we
@@ -51,14 +49,14 @@ TabStore.prototype = {
     }
   },
 
-  _resetStore: function () {
+  _resetStore: function() {
     this.response = null;
     this.tabs = [];
     this._selectedTab = null;
     this._selectedTabTargetPromise = null;
   },
 
-  _onStatusChanged: function () {
+  _onStatusChanged: function() {
     if (this._connection.status == Connection.Status.CONNECTED) {
       // Watch for changes to remote browser tabs
       this._connection.client.addListener("tabListChanged",
@@ -77,12 +75,12 @@ TabStore.prototype = {
     }
   },
 
-  _onTabListChanged: function () {
+  _onTabListChanged: function() {
     this.listTabs().then(() => this.emit("tab-list"))
                    .catch(console.error);
   },
 
-  _onTabNavigated: function (e, { from, title, url }) {
+  _onTabNavigated: function(e, { from, title, url }) {
     if (!this._selectedTab || from !== this._selectedTab.actor) {
       return;
     }
@@ -91,7 +89,7 @@ TabStore.prototype = {
     this.emit("navigate");
   },
 
-  listTabs: function () {
+  listTabs: function() {
     if (!this._connection || !this._connection.client) {
       return Promise.reject(new Error("Can't listTabs, not connected."));
     }
@@ -135,7 +133,7 @@ TabStore.prototype = {
     }
   },
 
-  _checkSelectedTab: function () {
+  _checkSelectedTab: function() {
     if (!this._selectedTab) {
       return;
     }
@@ -149,12 +147,12 @@ TabStore.prototype = {
     }
   },
 
-  getTargetForTab: function () {
+  getTargetForTab: function() {
     if (this._selectedTabTargetPromise) {
       return this._selectedTabTargetPromise;
     }
     let store = this;
-    this._selectedTabTargetPromise = (async function () {
+    this._selectedTabTargetPromise = (async function() {
       // If you connect to a tab, then detach from it, the root actor may have
       // de-listed the actors that belong to the tab.  This breaks the toolbox
       // if you try to connect to the same tab again.  To work around this
diff --git a/devtools/client/webide/modules/utils.js b/devtools/client/webide/modules/utils.js
index 494af25330fe..1aa16e0947f4 100644
--- a/devtools/client/webide/modules/utils.js
+++ b/devtools/client/webide/modules/utils.js
@@ -2,7 +2,7 @@
  * 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/. */
 
-const { Cc, Cu, Ci } = require("chrome");
+const { Cc, Ci } = require("chrome");
 const { FileUtils } = require("resource://gre/modules/FileUtils.jsm");
 const Services = require("Services");
 const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties");
diff --git a/devtools/client/webide/test/browser_tabs.js b/devtools/client/webide/test/browser_tabs.js
index 32b798c5be22..71cb5a8a7d3c 100644
--- a/devtools/client/webide/test/browser_tabs.js
+++ b/devtools/client/webide/test/browser_tabs.js
@@ -6,9 +6,9 @@ const TEST_URI = "http://example.com/browser/devtools/client/webide/test/doc_tab
 
 function test() {
   waitForExplicitFinish();
-  requestCompleteLog();
+  SimpleTest.requestCompleteLog();
 
-  (async function () {
+  (async function() {
     // Since we test the connections set below, destroy the server in case it
     // was left open.
     DebuggerServer.destroy();
@@ -73,7 +73,7 @@ function connectToLocal(win, docRuntime) {
 }
 
 function selectTabProject(win, docProject) {
-  return (async function () {
+  return (async function() {
     await waitForUpdate(win, "runtime-targets");
     let tabsNode = docProject.querySelector("#project-panel-tabs");
     let tabNode = tabsNode.querySelectorAll(".panel-item")[1];
diff --git a/devtools/client/webide/test/device_front_shared.js b/devtools/client/webide/test/device_front_shared.js
index 66f34238e780..899480bb469b 100644
--- a/devtools/client/webide/test/device_front_shared.js
+++ b/devtools/client/webide/test/device_front_shared.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+/* eslint no-unused-vars: ["error", {"args": "none", "vars": "local"}] */
+
 "use strict";
 
 var customName;
@@ -109,7 +111,7 @@ function addNewFieldInteger() {
   is(customValue.value, "", "Custom integer value reset");
 }
 
-var editFieldInteger = async function () {
+var editFieldInteger = async function() {
   // Edit existing custom integer preference
   newField.value = 3;
   newField.click();
@@ -130,7 +132,7 @@ var editFieldInteger = async function () {
   }
 };
 
-var resetExistingField = async function (id) {
+var resetExistingField = async function(id) {
   let existing = doc.getElementById(id);
   existing.click();
   is(existing.checked, true, "Existing boolean value is correct");
@@ -143,7 +145,7 @@ var resetExistingField = async function (id) {
   is(existing.checked, true, "Existing field reset");
 };
 
-var resetNewField = async function (id) {
+var resetNewField = async function(id) {
   let custom = doc.getElementById(id);
   custom.click();
   is(custom.value, "test", "New string value is correct");
@@ -171,7 +173,7 @@ function addNewFieldBoolean() {
   ok(found, "Found new boolean field line");
 
   // Mouse event trigger
-  var mouseClick = new MouseEvent("click", {
+  let mouseClick = new MouseEvent("click", {
     canBubble: true,
     cancelable: true,
     view: doc.parent,
diff --git a/devtools/client/webide/test/head.js b/devtools/client/webide/test/head.js
index 7c49b767506a..fa4cbf2399fa 100644
--- a/devtools/client/webide/test/head.js
+++ b/devtools/client/webide/test/head.js
@@ -10,8 +10,6 @@ const Services = require("Services");
 const { AppProjects } = require("devtools/client/webide/modules/app-projects");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 const { DebuggerServer } = require("devtools/server/main");
-const flags = require("devtools/shared/flags");
-flags.testing = true;
 
 var TEST_BASE;
 if (window.location === "chrome://browser/content/browser.xul") {
@@ -30,7 +28,6 @@ Services.prefs.setCharPref("devtools.devices.url", TEST_BASE + "browser_devices.
 var registerCleanupFunction = registerCleanupFunction ||
                               SimpleTest.registerCleanupFunction;
 registerCleanupFunction(() => {
-  flags.testing = false;
   Services.prefs.clearUserPref("devtools.webide.enabled");
   Services.prefs.clearUserPref("devtools.webide.enableLocalRuntime");
   Services.prefs.clearUserPref("devtools.webide.autoinstallADBHelper");
@@ -39,16 +36,16 @@ registerCleanupFunction(() => {
   Services.prefs.clearUserPref("devtools.webide.lastConnectedRuntime");
 });
 
-var openWebIDE = async function (autoInstallAddons) {
+var openWebIDE = async function(autoInstallAddons) {
   info("opening WebIDE");
 
   Services.prefs.setBoolPref("devtools.webide.autoinstallADBHelper", !!autoInstallAddons);
 
-  let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].getService(Ci.nsIWindowWatcher);
-  let win = ww.openWindow(null, "chrome://webide/content/", "webide", "chrome,centerscreen,resizable", null);
+  let win = Services.ww.openWindow(null, "chrome://webide/content/", "webide",
+                                   "chrome,centerscreen,resizable", null);
 
   await new Promise(resolve => {
-    win.addEventListener("load", function () {
+    win.addEventListener("load", function() {
       SimpleTest.requestCompleteLog();
       SimpleTest.executeSoon(resolve);
     }, {once: true});
@@ -63,7 +60,7 @@ function closeWebIDE(win) {
   info("Closing WebIDE");
 
   return new Promise(resolve => {
-    win.addEventListener("unload", function () {
+    win.addEventListener("unload", function() {
       info("WebIDE closed");
       SimpleTest.executeSoon(resolve);
     }, {once: true});
@@ -73,7 +70,7 @@ function closeWebIDE(win) {
 }
 
 function removeAllProjects() {
-  return (async function () {
+  return (async function() {
     await AppProjects.load();
     // use a new array so we're not iterating over the same
     // underlying array that's being modified by AppProjects
@@ -127,7 +124,7 @@ function documentIsLoaded(doc) {
 
 function lazyIframeIsLoaded(iframe) {
   return new Promise(resolve => {
-    iframe.addEventListener("load", function () {
+    iframe.addEventListener("load", function() {
       resolve(nextTick());
     }, {capture: true, once: true});
   });
@@ -144,7 +141,7 @@ function addTab(aUrl, aWindow) {
     let tab = targetBrowser.selectedTab = targetBrowser.addTab(aUrl);
     let linkedBrowser = tab.linkedBrowser;
 
-    BrowserTestUtils.browserLoaded(linkedBrowser).then(function () {
+    BrowserTestUtils.browserLoaded(linkedBrowser).then(function() {
       info("Tab added and finished loading: " + aUrl);
       resolve(tab);
     });
@@ -159,7 +156,7 @@ function removeTab(aTab, aWindow) {
     let targetBrowser = targetWindow.gBrowser;
     let tabContainer = targetBrowser.tabContainer;
 
-    tabContainer.addEventListener("TabClose", function (aEvent) {
+    tabContainer.addEventListener("TabClose", function(aEvent) {
       info("Tab removed and finished closing.");
       resolve();
     }, {once: true});
diff --git a/devtools/client/webide/test/test_addons.html b/devtools/client/webide/test/test_addons.html
index 632ad945d44e..3125299af451 100644
--- a/devtools/client/webide/test/test_addons.html
+++ b/devtools/client/webide/test/test_addons.html
@@ -15,12 +15,13 @@
   <body>
 
     <script type="application/javascript">
+      // XXX Bug 1072167 - When updating after migration, fix the no-undef issues.
+      /* eslint-disable no-undef */
+
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
-        const {Devices} = ChromeUtils.import("resource://devtools/shared/apps/Devices.jsm");
-
-        let adbAddonsInstalled;
+        const {Devices} = ChromeUtils.import("resource://devtools/shared/apps/Devices.jsm", {});
 
         function uninstallADBFromUI(doc) {
           return new Promise((resolve, reject) => {
@@ -33,26 +34,24 @@
                 } else {
                   reject("Can't find item");
                 }
-              })
+              });
             });
             let li = doc.querySelector('[status="installed"][addon="adb"]');
             li.querySelector(".uninstall-button").click();
           });
         }
 
-        (async function () {
-
+        (async function() {
           ok(!Devices.helperAddonInstalled, "Helper not installed");
 
           let win = await openWebIDE(true);
-          let docRuntime = getRuntimeDocument(win);
 
           ok(Devices.helperAddonInstalled, "Helper has been auto-installed");
 
           await nextTick();
 
           let w = addonDoc.querySelector(".warning");
-          let display = addonDoc.defaultView.getComputedStyle(w).display
+          let display = addonDoc.defaultView.getComputedStyle(w).display;
           is(display, "none", "Warning about missing ADB hidden");
 
           await uninstallADBFromUI(addonDoc, "adb");
@@ -60,15 +59,14 @@
           items = panelNode.querySelectorAll(".runtime-panel-item-usb");
           is(items.length, 0, "No usb runtime listed");
 
-          display = addonDoc.defaultView.getComputedStyle(w).display
+          display = addonDoc.defaultView.getComputedStyle(w).display;
           is(display, "block", "Warning about missing ADB present");
 
           await closeWebIDE(win);
 
           SimpleTest.finish();
-
         })();
-      }
+      };
     </script>
   </body>
 </html>
diff --git a/devtools/client/webide/test/test_app_validator.html b/devtools/client/webide/test/test_app_validator.html
index cac6974d049b..f918ec2e1181 100644
--- a/devtools/client/webide/test/test_app_validator.html
+++ b/devtools/client/webide/test/test_app_validator.html
@@ -21,27 +21,25 @@
     const Services = require("Services");
     const nsFile = Components.Constructor("@mozilla.org/file/local;1",
                                            "nsIFile", "initWithPath");
-    const cr = Cc["@mozilla.org/chrome/chrome-registry;1"]
-                 .getService(Ci.nsIChromeRegistry);
     const strings = Services.strings.createBundle("chrome://devtools/locale/app-manager.properties");
-    let httpserver, origin;
+    let httpserver, fakeOrigin;
 
     window.onload = function() {
       SimpleTest.waitForExplicitFinish();
 
       httpserver = new HttpServer();
       httpserver.start(-1);
-      origin = "http://localhost:" + httpserver.identity.primaryPort + "/";
+      fakeOrigin = "http://localhost:" + httpserver.identity.primaryPort + "/";
 
       next();
-    }
+    };
 
-    function createHosted(path, manifestFile="/manifest.webapp") {
+    function createHosted(path, manifestFile = "/manifest.webapp") {
       let dirPath = getTestFilePath("validator/" + path);
       httpserver.registerDirectory("/", nsFile(dirPath));
       return new AppValidator({
         type: "hosted",
-        location: origin + manifestFile
+        location: fakeOrigin + manifestFile
       });
     }
 
@@ -58,7 +56,7 @@
       if (test) {
         try {
           test();
-        } catch(e) {
+        } catch (e) {
           console.error("exception", String(e), e, e.stack);
         }
       } else {
@@ -70,82 +68,82 @@
 
     let tests =  [
       // Test a 100% valid example
-      function () {
+      function() {
         let validator = createHosted("valid");
         validator.validate().then(() => {
-            is(validator.errors.length, 0, "valid app got no error");
-            is(validator.warnings.length, 0, "valid app got no warning");
+          is(validator.errors.length, 0, "valid app got no error");
+          is(validator.warnings.length, 0, "valid app got no warning");
 
-            next();
-          });
+          next();
+        });
       },
 
-      function () {
+      function() {
         let validator = createPackaged("valid");
         validator.validate().then(() => {
-            is(validator.errors.length, 0, "valid packaged app got no error");
-            is(validator.warnings.length, 0, "valid packaged app got no warning");
+          is(validator.errors.length, 0, "valid packaged app got no error");
+          is(validator.warnings.length, 0, "valid packaged app got no warning");
 
-            next();
-          });
+          next();
+        });
       },
 
       // Test a launch path that returns a 404
-      function () {
+      function() {
         let validator = createHosted("wrong-launch-path");
         validator.validate().then(() => {
-            is(validator.errors.length, 1, "app with non-existant launch path got an error");
-            is(validator.errors[0], strings.formatStringFromName("validator.accessFailedLaunchPathBadHttpCode", [origin + "wrong-path.html", 404], 2),
+          is(validator.errors.length, 1, "app with non-existant launch path got an error");
+          is(validator.errors[0], strings.formatStringFromName("validator.accessFailedLaunchPathBadHttpCode", [fakeOrigin + "wrong-path.html", 404], 2),
                "with the right error message");
-            is(validator.warnings.length, 0, "but no warning");
-            next();
-          });
+          is(validator.warnings.length, 0, "but no warning");
+          next();
+        });
       },
-      function () {
+      function() {
         let validator = createPackaged("wrong-launch-path");
         validator.validate().then(() => {
-            is(validator.errors.length, 1, "app with wrong path got an error");
-            let file = nsFile(validator.location);
-            file.append("wrong-path.html");
-            let url = Services.io.newFileURI(file);
-            is(validator.errors[0], strings.formatStringFromName("validator.accessFailedLaunchPath", [url.spec], 1),
+          is(validator.errors.length, 1, "app with wrong path got an error");
+          let file = nsFile(validator.location);
+          file.append("wrong-path.html");
+          let url = Services.io.newFileURI(file);
+          is(validator.errors[0], strings.formatStringFromName("validator.accessFailedLaunchPath", [url.spec], 1),
                "with the expected message");
-            is(validator.warnings.length, 0, "but no warning");
+          is(validator.warnings.length, 0, "but no warning");
 
-            next();
-          });
+          next();
+        });
       },
 
       // Test when using a non-absolute path for launch_path
-      function () {
+      function() {
         let validator = createHosted("non-absolute-path");
         validator.validate().then(() => {
-            is(validator.errors.length, 1, "app with non absolute path got an error");
-            is(validator.errors[0], strings.formatStringFromName("validator.nonAbsoluteLaunchPath", ["non-absolute.html"], 1),
+          is(validator.errors.length, 1, "app with non absolute path got an error");
+          is(validator.errors[0], strings.formatStringFromName("validator.nonAbsoluteLaunchPath", ["non-absolute.html"], 1),
                "with expected message");
-            is(validator.warnings.length, 0, "but no warning");
-            next();
-          });
+          is(validator.warnings.length, 0, "but no warning");
+          next();
+        });
       },
-      function () {
+      function() {
         let validator = createPackaged("non-absolute-path");
         validator.validate().then(() => {
-            is(validator.errors.length, 1, "app with non absolute path got an error");
-            is(validator.errors[0], strings.formatStringFromName("validator.nonAbsoluteLaunchPath", ["non-absolute.html"], 1),
+          is(validator.errors.length, 1, "app with non absolute path got an error");
+          is(validator.errors[0], strings.formatStringFromName("validator.nonAbsoluteLaunchPath", ["non-absolute.html"], 1),
                "with expected message");
-            is(validator.warnings.length, 0, "but no warning");
-            next();
-          });
+          is(validator.warnings.length, 0, "but no warning");
+          next();
+        });
       },
 
       // Test multiple failures (missing name [error] and icon [warning])
-      function () {
+      function() {
         let validator = createHosted("no-name-or-icon");
         validator.validate().then(() => {
           checkNoNameOrIcon(validator);
         });
       },
-      function () {
+      function() {
         let validator = createPackaged("no-name-or-icon");
         validator.validate().then(() => {
           checkNoNameOrIcon(validator);
@@ -153,7 +151,7 @@
       },
 
       // Test a regular URL instead of a direct link to the manifest
-      function () {
+      function() {
         let validator = createHosted("valid", "/");
         validator.validate().then(() => {
           is(validator.warnings.length, 0, "manifest found got no warning");
@@ -164,7 +162,7 @@
       },
 
       // Test finding a manifest at origin's root
-      function () {
+      function() {
         let validator = createHosted("valid", "/unexisting-dir");
         validator.validate().then(() => {
           is(validator.warnings.length, 0, "manifest found at origin root got no warning");
diff --git a/devtools/client/webide/test/test_autoconnect_runtime.html b/devtools/client/webide/test/test_autoconnect_runtime.html
index 98e522e544f8..19df2ee1e351 100644
--- a/devtools/client/webide/test/test_autoconnect_runtime.html
+++ b/devtools/client/webide/test/test_autoconnect_runtime.html
@@ -18,7 +18,7 @@
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
-        (async function () {
+        (async function() {
           DebuggerServer.init();
           DebuggerServer.registerAllActors();
 
@@ -86,7 +86,7 @@
 
           SimpleTest.finish();
         })();
-      }
+      };
     </script>
   </body>
 </html>
diff --git a/devtools/client/webide/test/test_autoselect_project.html b/devtools/client/webide/test/test_autoselect_project.html
index 44a846e3ec83..9a2f8fcba6cc 100644
--- a/devtools/client/webide/test/test_autoselect_project.html
+++ b/devtools/client/webide/test/test_autoselect_project.html
@@ -18,7 +18,7 @@
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
-        (async function () {
+        (async function() {
           DebuggerServer.init();
           DebuggerServer.registerAllActors();
 
@@ -102,7 +102,7 @@
 
           SimpleTest.finish();
         })();
-      }
+      };
     </script>
   </body>
 </html>
diff --git a/devtools/client/webide/test/test_basic.html b/devtools/client/webide/test/test_basic.html
index f0e40dafde01..93f19a302a6b 100644
--- a/devtools/client/webide/test/test_basic.html
+++ b/devtools/client/webide/test/test_basic.html
@@ -18,39 +18,39 @@
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
-        (async function () {
-            let win = await openWebIDE();
+        (async function() {
+          let win = await openWebIDE();
 
-            const {gDevToolsBrowser} = require("devtools/client/framework/devtools-browser");
-            await gDevToolsBrowser.isWebIDEInitialized.promise;
-            ok(true, "WebIDE was initialized");
+          const {gDevToolsBrowser} = require("devtools/client/framework/devtools-browser");
+          await gDevToolsBrowser.isWebIDEInitialized.promise;
+          ok(true, "WebIDE was initialized");
 
-            ok(win, "Found a window");
-            ok(win.AppManager, "App Manager accessible");
-            let appmgr = win.AppManager;
-            ok(appmgr.connection, "App Manager connection ready");
-            ok(appmgr.runtimeList, "Runtime list ready");
+          ok(win, "Found a window");
+          ok(win.AppManager, "App Manager accessible");
+          let appmgr = win.AppManager;
+          ok(appmgr.connection, "App Manager connection ready");
+          ok(appmgr.runtimeList, "Runtime list ready");
 
             // test error reporting
-            let nbox = win.document.querySelector("#notificationbox");
-            let notification =  nbox.getNotificationWithValue("webide:errornotification");
-            ok(!notification, "No notification yet");
-            let deferred = new Promise((resolve, reject) => {
-              nextTick().then(() => {
-                reject("BOOM!");
-              });
+          let nbox = win.document.querySelector("#notificationbox");
+          let notification =  nbox.getNotificationWithValue("webide:errornotification");
+          ok(!notification, "No notification yet");
+          let deferred = new Promise((resolve, reject) => {
+            nextTick().then(() => {
+              reject("BOOM!");
             });
-            try {
-              await win.UI.busyUntil(deferred, "xx");
-            } catch(e) {/* This *will* fail */}
-            notification =  nbox.getNotificationWithValue("webide:errornotification");
-            ok(notification, "Error has been reported");
+          });
+          try {
+            await win.UI.busyUntil(deferred, "xx");
+          } catch (e) { /* This *will* fail */ }
+          notification =  nbox.getNotificationWithValue("webide:errornotification");
+          ok(notification, "Error has been reported");
 
-            await closeWebIDE(win);
+          await closeWebIDE(win);
 
-            SimpleTest.finish();
+          SimpleTest.finish();
         })();
-      }
+      };
     </script>
   </body>
 </html>
diff --git a/devtools/client/webide/test/test_device_preferences.html b/devtools/client/webide/test/test_device_preferences.html
index 14a9799a7d3f..2339caf759e9 100644
--- a/devtools/client/webide/test/test_device_preferences.html
+++ b/devtools/client/webide/test/test_device_preferences.html
@@ -15,10 +15,11 @@
   <body>
 
     <script type="application/javascript">
+      /* import-globals-from device_front_shared.js */
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
-        (async function () {
+        (async function() {
           DebuggerServer.init();
           DebuggerServer.registerAllActors();
 
@@ -79,7 +80,7 @@
           ok(false, "Exception: " + e);
           SimpleTest.finish();
         });
-      }
+      };
     </script>
   </body>
 </html>
diff --git a/devtools/client/webide/test/test_device_runtime.html b/devtools/client/webide/test/test_device_runtime.html
index 85934d73339d..d2840c4b81aa 100644
--- a/devtools/client/webide/test/test_device_runtime.html
+++ b/devtools/client/webide/test/test_device_runtime.html
@@ -18,7 +18,7 @@
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
-        (async function () {
+        (async function() {
           DebuggerServer.init();
           DebuggerServer.registerAllActors();
 
@@ -51,7 +51,7 @@
           let found = false;
 
           for (let tr of trs) {
-            let [name,val] = tr.querySelectorAll("td");
+            let [name, val] = tr.querySelectorAll("td");
             if (name.textContent == "appid") {
               found = true;
               is(val.textContent, Services.appinfo.ID, "appid has the right value");
@@ -73,7 +73,7 @@
           ok(false, "Exception: " + e);
           SimpleTest.finish();
         });
-      }
+      };
     </script>
   </body>
 </html>
diff --git a/devtools/client/webide/test/test_duplicate_import.html b/devtools/client/webide/test/test_duplicate_import.html
index 34a1f4a8a693..b594c983b8fb 100644
--- a/devtools/client/webide/test/test_duplicate_import.html
+++ b/devtools/client/webide/test/test_duplicate_import.html
@@ -17,7 +17,7 @@
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
-        (async function () {
+        (async function() {
           let win = await openWebIDE();
           let docProject = getProjectDocument(win);
           let winProject = getProjectWindow(win);
@@ -70,7 +70,7 @@
           ok(false, "Exception: " + e);
           SimpleTest.finish();
         });
-      }
+      };
     </script>
   </body>
 </html>
diff --git a/devtools/client/webide/test/test_fullscreenToolbox.html b/devtools/client/webide/test/test_fullscreenToolbox.html
index ce1cdcde1154..2d99401e2a13 100644
--- a/devtools/client/webide/test/test_fullscreenToolbox.html
+++ b/devtools/client/webide/test/test_fullscreenToolbox.html
@@ -27,7 +27,7 @@
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
-        (async function () {
+        (async function() {
           let win = await openWebIDE();
           let docProject = getProjectDocument(win);
           let docRuntime = getRuntimeDocument(win);
@@ -61,7 +61,7 @@
 
           SimpleTest.finish();
         })();
-      }
+      };
     </script>
   </body>
 </html>
diff --git a/devtools/client/webide/test/test_import.html b/devtools/client/webide/test/test_import.html
index 4fc9381a50cf..8ae78e3f547e 100644
--- a/devtools/client/webide/test/test_import.html
+++ b/devtools/client/webide/test/test_import.html
@@ -17,7 +17,7 @@
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
-        (async function () {
+        (async function() {
           let win = await openWebIDE();
           let docProject = getProjectDocument(win);
           let winProject = getProjectWindow(win);
@@ -58,7 +58,7 @@
           await waitForUpdate(win, "project-validated");
 
           project = win.AppManager.selectedProject;
-          ok(project.location.endsWith('manifest.webapp'), "The manifest was found and the project was updated");
+          ok(project.location.endsWith("manifest.webapp"), "The manifest was found and the project was updated");
 
           let panelNode = docProject.querySelector("#project-panel");
           let items = panelNode.querySelectorAll(".panel-item");
@@ -76,7 +76,7 @@
           ok(false, "Exception: " + e);
           SimpleTest.finish();
         });
-      }
+      };
     </script>
   </body>
 </html>
diff --git a/devtools/client/webide/test/test_manifestUpdate.html b/devtools/client/webide/test/test_manifestUpdate.html
index f4e7d630d8c9..bb502fa18998 100644
--- a/devtools/client/webide/test/test_manifestUpdate.html
+++ b/devtools/client/webide/test/test_manifestUpdate.html
@@ -20,79 +20,78 @@
 
         let {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm", {});
 
-        (async function () {
-            let win = await openWebIDE();
-            let winProject = getProjectWindow(win);
-            let AppManager = win.AppManager;
+        (async function() {
+          let win = await openWebIDE();
+          let winProject = getProjectWindow(win);
+          let AppManager = win.AppManager;
 
-            function isProjectMarkedAsValid() {
-              let details = win.frames[1];
-              return !details.document.body.classList.contains("error");
-            }
+          function isProjectMarkedAsValid() {
+            let details = win.frames[1];
+            return !details.document.body.classList.contains("error");
+          }
 
-            let packagedAppLocation = getTestFilePath("app");
+          let packagedAppLocation = getTestFilePath("app");
 
-            let onValidated = waitForUpdate(win, "project-validated");
-            let onDetails = waitForUpdate(win, "details");
-            await winProject.projectList.importPackagedApp(packagedAppLocation);
-            await onValidated;
-            await onDetails;
+          let onValidated = waitForUpdate(win, "project-validated");
+          let onDetails = waitForUpdate(win, "details");
+          await winProject.projectList.importPackagedApp(packagedAppLocation);
+          await onValidated;
+          await onDetails;
 
-            let project = win.AppManager.selectedProject;
+          let project = win.AppManager.selectedProject;
 
-            ok("name" in project.manifest, "manifest includes name");
-            is(project.name, project.manifest.name, "Display name uses manifest name");
-            ok(isProjectMarkedAsValid(), "project is marked as valid");
+          ok("name" in project.manifest, "manifest includes name");
+          is(project.name, project.manifest.name, "Display name uses manifest name");
+          ok(isProjectMarkedAsValid(), "project is marked as valid");
 
             // Change the name
-            let originalName = project.manifest.name;
+          let originalName = project.manifest.name;
 
-            project.manifest.name = "xxx";
+          project.manifest.name = "xxx";
 
             // Write to disk
-            await AppManager.writeManifest(project);
+          await AppManager.writeManifest(project);
 
             // Read file
-            let manifestPath = OS.Path.join(packagedAppLocation, "manifest.webapp");
-            let Decoder = new TextDecoder();
-            let data = await OS.File.read(manifestPath);
-            data = new TextDecoder().decode(data);
-            let json = JSON.parse(data);
-            is(json.name, "xxx", "manifest written on disc");
+          let manifestPath = OS.Path.join(packagedAppLocation, "manifest.webapp");
+          let data = await OS.File.read(manifestPath);
+          data = new TextDecoder().decode(data);
+          let json = JSON.parse(data);
+          is(json.name, "xxx", "manifest written on disc");
 
             // Make the manifest invalid on disk
-            delete json.name;
-            let Encoder = new TextEncoder();
-            data = Encoder.encode(JSON.stringify(json));
-            await OS.File.writeAtomic(manifestPath, data , {tmpPath: manifestPath + ".tmp"});
+          delete json.name;
+          let Encoder = new TextEncoder();
+          data = Encoder.encode(JSON.stringify(json));
+          await OS.File.writeAtomic(manifestPath, data, {tmpPath: manifestPath + ".tmp"});
 
             // Trigger validation
-            await AppManager.validateAndUpdateProject(AppManager.selectedProject);
-            await nextTick();
+          await AppManager.validateAndUpdateProject(AppManager.selectedProject);
+          await nextTick();
 
-            ok(!("name" in project.manifest), "manifest has been updated");
-            is(project.name, "--", "Placeholder is used for display name");
-            ok(!isProjectMarkedAsValid(), "project is marked as invalid");
+          ok(!("name" in project.manifest), "manifest has been updated");
+          is(project.name, "--", "Placeholder is used for display name");
+          ok(!isProjectMarkedAsValid(), "project is marked as invalid");
 
             // Make the manifest valid on disk
-            project.manifest.name = originalName;
-            await AppManager.writeManifest(project);
+          project.manifest.name = originalName;
+          await AppManager.writeManifest(project);
 
             // Trigger validation
-            await AppManager.validateAndUpdateProject(AppManager.selectedProject);
-            await nextTick();
+          await AppManager.validateAndUpdateProject(AppManager.selectedProject);
+          await nextTick();
 
-            ok("name" in project.manifest, "manifest includes name");
-            is(project.name, originalName, "Display name uses original manifest name");
-            ok(isProjectMarkedAsValid(), "project is marked as valid");
+          ok("name" in project.manifest, "manifest includes name");
+          is(project.name, originalName, "Display name uses original manifest name");
+          ok(isProjectMarkedAsValid(), "project is marked as valid");
 
-            await closeWebIDE(win);
+          await closeWebIDE(win);
 
-            await removeAllProjects();
+          await removeAllProjects();
 
-            SimpleTest.finish();
+          SimpleTest.finish();
         })();
-      }
+      };
     </script>
   </body>
 </html>
diff --git a/devtools/client/webide/test/test_newapp.html b/devtools/client/webide/test/test_newapp.html
index fc0c19e54dba..5cd9c6a14525 100644
--- a/devtools/client/webide/test/test_newapp.html
+++ b/devtools/client/webide/test/test_newapp.html
@@ -18,7 +18,7 @@
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
-        (async function () {
+        (async function() {
           let win = await openWebIDE();
           let winProject = getProjectWindow(win);
           let tmpDir = FileUtils.getDir("TmpD", []);
@@ -40,7 +40,7 @@
           await removeAllProjects();
           SimpleTest.finish();
         })();
-      }
+      };
     </script>
   </body>
 </html>
diff --git a/devtools/client/webide/test/test_runtime.html b/devtools/client/webide/test/test_runtime.html
index fb4c464fb675..a254e0b807ec 100644
--- a/devtools/client/webide/test/test_runtime.html
+++ b/devtools/client/webide/test/test_runtime.html
@@ -21,7 +21,7 @@
         let win;
 
         SimpleTest.registerCleanupFunction(() => {
-          (async function () {
+          (async function() {
             if (win) {
               await closeWebIDE(win);
             }
@@ -30,7 +30,7 @@
           })();
         });
 
-        (async function () {
+        (async function() {
           function isPlayActive() {
             return !win.document.querySelector("#cmd_play").hasAttribute("disabled");
           }
@@ -165,7 +165,7 @@
           ok(win.document.querySelector("window").className, "busy", "UI is busy");
 
           // Wait for error message since connection never completes
-          let errorDeferred = new Promise(resolve => {
+          await new Promise(resolve => {
             win.UI.reportError = errorName => {
               if (errorName === "error_operationTimeout") {
                 resolve();
@@ -190,9 +190,11 @@
             }, 1000);
           });
 
+          await noErrorDeferred;
+
           SimpleTest.finish();
         })();
-      }
+      };
     </script>
   </body>
 </html>
diff --git a/devtools/client/webide/test/test_toolbox.html b/devtools/client/webide/test/test_toolbox.html
index e778fea0d56e..c3629cbe1c6c 100644
--- a/devtools/client/webide/test/test_toolbox.html
+++ b/devtools/client/webide/test/test_toolbox.html
@@ -21,7 +21,7 @@
         let win;
 
         SimpleTest.registerCleanupFunction(() => {
-          (async function () {
+          (async function() {
             if (win) {
               await closeWebIDE(win);
             }
@@ -30,7 +30,7 @@
           })();
         });
 
-        (async function () {
+        (async function() {
           DebuggerServer.init();
           DebuggerServer.registerAllActors();
 
@@ -41,7 +41,7 @@
           win.AppManager.update("runtime-list");
 
           let deferred = new Promise(resolve => {
-             win.AppManager.connection.once(
+            win.AppManager.connection.once(
                  win.Connection.Events.CONNECTED,
                  resolve);
           });
@@ -51,6 +51,8 @@
           ok(win.document.querySelector("window").className, "busy", "UI is busy");
           await win.UI._busyPromise;
 
+          await deferred;
+
           is(Object.keys(DebuggerServer._connections).length, 1, "Connected");
 
           await waitForUpdate(win, "runtime-global-actors");
@@ -86,7 +88,7 @@
 
           SimpleTest.finish();
         })();
-      }
+      };
     </script>
   </body>
 </html>
diff --git a/devtools/client/webide/test/test_zoom.html b/devtools/client/webide/test/test_zoom.html
index 06861b0b4e55..992ea55df17e 100644
--- a/devtools/client/webide/test/test_zoom.html
+++ b/devtools/client/webide/test/test_zoom.html
@@ -18,60 +18,60 @@
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
-        (async function () {
-            let win = await openWebIDE();
-            let viewer = win.QueryInterface(Ci.nsIInterfaceRequestor)
+        (async function() {
+          let win = await openWebIDE();
+          let viewer = win.QueryInterface(Ci.nsIInterfaceRequestor)
                             .getInterface(Ci.nsIWebNavigation)
                             .QueryInterface(Ci.nsIDocShell)
                             .contentViewer;
 
-            win.Cmds.zoomOut();
-            win.Cmds.zoomOut();
-            win.Cmds.zoomOut();
-            win.Cmds.zoomOut();
-            win.Cmds.zoomOut();
-            win.Cmds.zoomOut();
-            win.Cmds.zoomOut();
+          win.Cmds.zoomOut();
+          win.Cmds.zoomOut();
+          win.Cmds.zoomOut();
+          win.Cmds.zoomOut();
+          win.Cmds.zoomOut();
+          win.Cmds.zoomOut();
+          win.Cmds.zoomOut();
 
-            let roundZoom = Math.round(10 * viewer.fullZoom) / 10;
-            is(roundZoom, 0.6, "Reach min zoom");
+          let roundZoom = Math.round(10 * viewer.fullZoom) / 10;
+          is(roundZoom, 0.6, "Reach min zoom");
 
-            win.Cmds.zoomIn();
-            win.Cmds.zoomIn();
-            win.Cmds.zoomIn();
-            win.Cmds.zoomIn();
-            win.Cmds.zoomIn();
-            win.Cmds.zoomIn();
-            win.Cmds.zoomIn();
-            win.Cmds.zoomIn();
-            win.Cmds.zoomIn();
-            win.Cmds.zoomIn();
-            win.Cmds.zoomIn();
-            win.Cmds.zoomIn();
+          win.Cmds.zoomIn();
+          win.Cmds.zoomIn();
+          win.Cmds.zoomIn();
+          win.Cmds.zoomIn();
+          win.Cmds.zoomIn();
+          win.Cmds.zoomIn();
+          win.Cmds.zoomIn();
+          win.Cmds.zoomIn();
+          win.Cmds.zoomIn();
+          win.Cmds.zoomIn();
+          win.Cmds.zoomIn();
+          win.Cmds.zoomIn();
 
-            roundZoom = Math.round(10 * viewer.fullZoom) / 10;
-            is(roundZoom, 1.4, "Reach max zoom");
+          roundZoom = Math.round(10 * viewer.fullZoom) / 10;
+          is(roundZoom, 1.4, "Reach max zoom");
 
-            await closeWebIDE(win);
+          await closeWebIDE(win);
 
-            win = await openWebIDE();
-            viewer = win.QueryInterface(Ci.nsIInterfaceRequestor)
+          win = await openWebIDE();
+          viewer = win.QueryInterface(Ci.nsIInterfaceRequestor)
                         .getInterface(Ci.nsIWebNavigation)
                         .QueryInterface(Ci.nsIDocShell)
                         .contentViewer;
 
-            roundZoom = Math.round(10 * viewer.fullZoom) / 10;
-            is(roundZoom, 1.4, "Zoom restored");
+          roundZoom = Math.round(10 * viewer.fullZoom) / 10;
+          is(roundZoom, 1.4, "Zoom restored");
 
-            win.Cmds.resetZoom();
+          win.Cmds.resetZoom();
 
-            is(viewer.fullZoom, 1, "Zoom reset");
+          is(viewer.fullZoom, 1, "Zoom reset");
 
-            await closeWebIDE(win);
+          await closeWebIDE(win);
 
-            SimpleTest.finish();
+          SimpleTest.finish();
         })();
-      }
+      };
     </script>
   </body>
 </html>
diff --git a/devtools/server/main.js b/devtools/server/main.js
index 97efcbdef6f7..8f1075c8fa7b 100644
--- a/devtools/server/main.js
+++ b/devtools/server/main.js
@@ -16,7 +16,6 @@ var { LocalDebuggerTransport, ChildDebuggerTransport, WorkerDebuggerTransport }
   require("devtools/shared/transport/transport");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 var { dumpn } = DevToolsUtils;
-var flags = require("devtools/shared/flags");
 
 DevToolsUtils.defineLazyGetter(this, "DebuggerSocket", () => {
   let { DebuggerSocket } = require("devtools/shared/security/socket");
@@ -39,19 +38,6 @@ Object.defineProperty(this, "Components", {
   }
 });
 
-if (isWorker) {
-  flags.wantLogging = true;
-  flags.wantVerbose = true;
-} else {
-  const LOG_PREF = "devtools.debugger.log";
-  const VERBOSE_PREF = "devtools.debugger.log.verbose";
-
-  flags.wantLogging = Services.prefs.getBoolPref(LOG_PREF);
-  flags.wantVerbose =
-    Services.prefs.getPrefType(VERBOSE_PREF) !== Services.prefs.PREF_INVALID &&
-    Services.prefs.getBoolPref(VERBOSE_PREF);
-}
-
 const CONTENT_PROCESS_SERVER_STARTUP_SCRIPT =
   "resource://devtools/server/startup/content-process.js";
 
diff --git a/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html b/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html
index 7b26ff9e4921..f2b0da7b3cb6 100644
--- a/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html
+++ b/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html
@@ -19,12 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1192536
   <script type="application/javascript">
 "use strict";
 
-const flags = require("devtools/shared/flags");
-const wasTesting = flags.testing;
-SimpleTest.registerCleanupFunction(function() {
-  flags.testing = wasTesting;
-});
-
 const PATH = "http://mochi.test:8888/chrome/devtools/server/tests/mochitest/";
 const BASE_IMAGE = PATH + "inspector-delay-image-response.sjs";
 const DELAYED_IMAGE = BASE_IMAGE + "?delay=300";
@@ -36,6 +30,13 @@ window.onload = function() {
   runNextTest();
 };
 
+function pushPref(preferenceName, value) {
+  return new Promise(resolve => {
+    let options = {"set": [[preferenceName, value]]};
+    SpecialPowers.pushPrefEnv(options, resolve);
+  });
+}
+
 let gImg = null;
 let gNodeFront = null;
 let gWalker = null;
@@ -60,11 +61,11 @@ addTest(function setup() {
   });
 });
 
-addTest(function testTimeout() {
+addTest(async function testTimeout() {
   info("Testing that the method aborts if the image takes too long to load.");
 
   // imageToImageData() only times out when flags.testing is not set.
-  flags.testing = false;
+  await pushPref("devtools.testing", false);
 
   gImg.src = TIMEOUT_IMAGE;
 
@@ -72,11 +73,11 @@ addTest(function testTimeout() {
   ensureRejects(gNodeFront.getImageData(), "Timeout image").then(runNextTest);
 });
 
-addTest(function testNonExistentImage() {
+addTest(async function testNonExistentImage() {
   info("Testing that non-existent image causes a rejection.");
 
   // This test shouldn't hit the timeout.
-  flags.testing = true;
+  await pushPref("devtools.testing", true);
 
   gImg.src = NONEXISTENT_IMAGE;
 
@@ -84,11 +85,11 @@ addTest(function testNonExistentImage() {
   ensureRejects(gNodeFront.getImageData(), "Non-existent image").then(runNextTest);
 });
 
-addTest(function testDelayedImage() {
+addTest(async function testDelayedImage() {
   info("Testing that the method waits for an image to load.");
 
   // This test shouldn't hit the timeout.
-  flags.testing = true;
+  await pushPref("devtools.testing", true);
 
   gImg.src = DELAYED_IMAGE;
 
diff --git a/devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html b/devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html
index e9e2ccc06797..d5c9fb9c07f7 100644
--- a/devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html
+++ b/devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html
@@ -18,12 +18,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1192536
   <script type="application/javascript">
 "use strict";
 
-const flags = require("devtools/shared/flags");
-const wasTesting = flags.testing;
-SimpleTest.registerCleanupFunction(function() {
-  flags.testing = wasTesting;
-});
-
 const PATH = "http://mochi.test:8888/chrome/devtools/server/tests/mochitest/";
 const BASE_IMAGE = PATH + "inspector-delay-image-response.sjs";
 const DELAYED_IMAGE = BASE_IMAGE + "?delay=300";
@@ -35,6 +29,13 @@ window.onload = function() {
   runNextTest();
 };
 
+function pushPref(preferenceName, value) {
+  return new Promise(resolve => {
+    let options = {"set": [[preferenceName, value]]};
+    SpecialPowers.pushPrefEnv(options, resolve);
+  });
+}
+
 let gInspector = null;
 
 addTest(function setup() {
@@ -46,31 +47,31 @@ addTest(function setup() {
   });
 });
 
-addTest(function testTimeout() {
+addTest(async function testTimeout() {
   info("Testing that the method aborts if the image takes too long to load.");
 
   // imageToImageData() only times out when flags.testing is not set.
-  flags.testing = false;
+  await pushPref("devtools.testing", false);
 
   ensureRejects(gInspector.getImageDataFromURL(TIMEOUT_IMAGE),
     "Image that loads for too long").then(runNextTest);
 });
 
-addTest(function testNonExistentImage() {
+addTest(async function testNonExistentImage() {
   info("Testing that non-existent image causes a rejection.");
 
   // This test shouldn't hit the timeout.
-  flags.testing = true;
+  await pushPref("devtools.testing", true);
 
   ensureRejects(gInspector.getImageDataFromURL(NONEXISTENT_IMAGE),
     "Non-existent image").then(runNextTest);
 });
 
-addTest(function testNormalImage() {
+addTest(async function testNormalImage() {
   info("Testing that the method waits for an image to load.");
 
   // This test shouldn't hit the timeout.
-  flags.testing = true;
+  await pushPref("devtools.testing", true);
 
   checkImageData(gInspector.getImageDataFromURL(DELAYED_IMAGE)).then(runNextTest);
 });
diff --git a/devtools/shared/flags.js b/devtools/shared/flags.js
index 6aaf337d292d..40bd8aafa678 100644
--- a/devtools/shared/flags.js
+++ b/devtools/shared/flags.js
@@ -1,26 +1,42 @@
 "use strict";
 
+const Services = require("Services");
+
 /*
  * Create a writable property by tracking it with a private variable.
  * We cannot make a normal property writeable on `exports` because
  * the module system freezes it.
  */
-function makeWritableFlag(exports, name) {
-  let flag = false;
+function makeWritableFlag(exports, name, pref) {
+  let flag;
+  // We don't have access to pref in worker, so disable all logs by default
+  if (isWorker) {
+    flag = false;
+  } else {
+    flag = Services.prefs.getBoolPref(pref, false);
+    let prefObserver = () => {
+      flag = Services.prefs.getBoolPref(pref, false);
+    };
+    Services.prefs.addObserver(pref, prefObserver);
+
+    // Also listen for Loader unload to unregister the pref observer and prevent leaking
+    let unloadObserver = function() {
+      Services.prefs.removeObserver(pref, prefObserver);
+      Services.obs.removeObserver(unloadObserver, "devtools:loader:destroy");
+    };
+    Services.obs.addObserver(unloadObserver, "devtools:loader:destroy");
+  }
   Object.defineProperty(exports, name, {
     get: function() {
       return flag;
-    },
-    set: function(state) {
-      flag = state;
     }
   });
 }
 
-makeWritableFlag(exports, "wantLogging");
-makeWritableFlag(exports, "wantVerbose");
+makeWritableFlag(exports, "wantLogging", "devtools.debugger.log");
+makeWritableFlag(exports, "wantVerbose", "devtools.debugger.log.verbose");
 
 // When the testing flag is set, various behaviors may be altered from
 // production mode, typically to enable easier testing or enhanced
 // debugging.
-makeWritableFlag(exports, "testing");
+makeWritableFlag(exports, "testing", "devtools.testing");
diff --git a/devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.js b/devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.js
index 6f590076c660..73ed1863c4ae 100644
--- a/devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.js
+++ b/devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.js
@@ -18,7 +18,6 @@ const { addDebuggerToGlobal } =
   ChromeUtils.import("resource://gre/modules/jsdebugger.jsm", {});
 
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
-const flags = require("devtools/shared/flags");
 const HeapAnalysesClient =
   require("devtools/shared/heapsnapshot/HeapAnalysesClient");
 const Services = require("Services");
@@ -32,8 +31,10 @@ const { LabelAndShallowSizeVisitor } = DominatorTreeNode;
 // the output away anyway, unless you give it the --verbose flag.
 if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_DEFAULT) {
   Services.prefs.setBoolPref("devtools.debugger.log", true);
+  registerCleanupFunction(() => {
+    Services.prefs.clearUserPref("devtools.debugger.log");
+  });
 }
-flags.wantLogging = true;
 
 const SYSTEM_PRINCIPAL = Cc["@mozilla.org/systemprincipal;1"]
   .createInstance(Ci.nsIPrincipal);
diff --git a/devtools/shared/tests/unit/head_devtools.js b/devtools/shared/tests/unit/head_devtools.js
index 4cd7a2cca60a..b27cbcac6b8d 100644
--- a/devtools/shared/tests/unit/head_devtools.js
+++ b/devtools/shared/tests/unit/head_devtools.js
@@ -8,11 +8,10 @@
 const { require, DevToolsLoader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const Services = require("Services");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
-const flags = require("devtools/shared/flags");
 
-flags.testing = true;
+Services.prefs.setBoolPref("devtools.testing", true);
 registerCleanupFunction(() => {
-  flags.testing = false;
+  Services.prefs.clearUserPref("devtools.testing");
 });
 
 // Register a console listener, so console messages don't just disappear
diff --git a/devtools/shared/tests/unit/test_assert.js b/devtools/shared/tests/unit/test_assert.js
index e5fe01974139..7956961c2f7f 100644
--- a/devtools/shared/tests/unit/test_assert.js
+++ b/devtools/shared/tests/unit/test_assert.js
@@ -9,9 +9,6 @@
 ALLOW_CONSOLE_ERRORS = true;
 
 function run_test() {
-  // Enable assertions.
-  flags.testing = true;
-
   const { assert } = DevToolsUtils;
   equal(typeof assert, "function");
 
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index 76ae6c929dca..91d2be5889c8 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -7984,7 +7984,7 @@ nsContentUtils::DataTransferItemToImage(const IPCDataTransferItem& aItem,
 
   RefPtr<DataSourceSurface> image =
       CreateDataSourceSurfaceFromData(size,
-                                      static_cast<SurfaceFormat>(imageDetails.format()),
+                                      imageDetails.format(),
                                       data.get<uint8_t>(),
                                       imageDetails.stride());
 
@@ -8142,7 +8142,7 @@ nsContentUtils::TransferableToIPCTransferable(nsITransferable* aTransferable,
             imageDetails.width() = size.width;
             imageDetails.height() = size.height;
             imageDetails.stride() = stride;
-            imageDetails.format() = static_cast<uint8_t>(dataSurface->GetFormat());
+            imageDetails.format() = dataSurface->GetFormat();
 
             continue;
           }
diff --git a/dom/ipc/DOMTypes.ipdlh b/dom/ipc/DOMTypes.ipdlh
index 70b423dc9989..6acf3c63f2bc 100644
--- a/dom/ipc/DOMTypes.ipdlh
+++ b/dom/ipc/DOMTypes.ipdlh
@@ -28,6 +28,8 @@ using mozilla::dom::ScreenOrientationInternal from "mozilla/dom/ScreenOrientatio
 using struct mozilla::layers::TextureFactoryIdentifier from "mozilla/layers/CompositorTypes.h";
 using mozilla::layers::CompositorOptions from "mozilla/layers/CompositorOptions.h";
 using mozilla::layers::LayersId from "mozilla/layers/LayersTypes.h";
+using mozilla::gfx::SurfaceFormat from "mozilla/gfx/Types.h";
+
 
 namespace mozilla {
 namespace dom {
@@ -66,7 +68,7 @@ struct IPCDataTransferImage
   uint32_t width;
   uint32_t height;
   uint32_t stride;
-  uint8_t format;
+  SurfaceFormat format;
 };
 
 struct IPCDataTransferItem
diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl
index 35632ba15370..3d766c08e6db 100644
--- a/dom/ipc/PBrowser.ipdl
+++ b/dom/ipc/PBrowser.ipdl
@@ -33,6 +33,7 @@ include "mozilla/layers/LayersMessageUtils.h";
 
 using class IPC::Principal from "mozilla/dom/PermissionMessageUtils.h";
 using mozilla::gfx::Matrix from "mozilla/gfx/Matrix.h";
+using mozilla::gfx::SurfaceFormat from "mozilla/gfx/Types.h";
 using mozilla::LayoutDeviceIntPoint from "Units.h";
 using mozilla::LayoutDevicePoint from "Units.h";
 using mozilla::ScreenIntPoint from "Units.h";
@@ -394,7 +395,7 @@ parent:
      *   update.
      */
     async SetCustomCursor(nsCString cursorData, uint32_t width, uint32_t height,
-                          uint32_t stride, uint8_t format,
+                          uint32_t stride, SurfaceFormat format,
                           uint32_t hotspotX, uint32_t hotspotY, bool force);
 
     /**
@@ -568,7 +569,7 @@ parent:
 
     async InvokeDragSession(IPCDataTransfer[] transfers, uint32_t action,
                             OptionalShmem visualData,
-                            uint32_t stride, uint8_t format,
+                            uint32_t stride, SurfaceFormat format,
                             LayoutDeviceIntRect dragRect,
                             nsCString principalURISpec);
 
diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index 8663e543ce2b..2478640c362d 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -1743,7 +1743,7 @@ TabParent::RecvSetCustomCursor(const nsCString& aCursorData,
                                const uint32_t& aWidth,
                                const uint32_t& aHeight,
                                const uint32_t& aStride,
-                               const uint8_t& aFormat,
+                               const gfx::SurfaceFormat& aFormat,
                                const uint32_t& aHotspotX,
                                const uint32_t& aHotspotY,
                                const bool& aForce)
@@ -1761,7 +1761,7 @@ TabParent::RecvSetCustomCursor(const nsCString& aCursorData,
 
       RefPtr<gfx::DataSourceSurface> customCursor =
           gfx::CreateDataSourceSurfaceFromData(size,
-                                               static_cast<gfx::SurfaceFormat>(aFormat),
+                                               aFormat,
                                                reinterpret_cast<const uint8_t*>(aCursorData.BeginReading()),
                                                aStride);
 
@@ -3295,7 +3295,7 @@ mozilla::ipc::IPCResult
 TabParent::RecvInvokeDragSession(nsTArray<IPCDataTransfer>&& aTransfers,
                                  const uint32_t& aAction,
                                  const OptionalShmem& aVisualDnDData,
-                                 const uint32_t& aStride, const uint8_t& aFormat,
+                                 const uint32_t& aStride, const gfx::SurfaceFormat& aFormat,
                                  const LayoutDeviceIntRect& aDragRect,
                                  const nsCString& aPrincipalURISpec)
 {
@@ -3332,7 +3332,7 @@ TabParent::RecvInvokeDragSession(nsTArray<IPCDataTransfer>&& aTransfers,
   } else {
     mDnDVisualization =
         gfx::CreateDataSourceSurfaceFromData(gfx::IntSize(aDragRect.width, aDragRect.height),
-                                             static_cast<gfx::SurfaceFormat>(aFormat),
+                                             aFormat,
                                              aVisualDnDData.get_Shmem().get<uint8_t>(),
                                              aStride);
   }
diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h
index 0f180c35e542..ac6e8b1d704a 100644
--- a/dom/ipc/TabParent.h
+++ b/dom/ipc/TabParent.h
@@ -280,7 +280,7 @@ public:
                                                       const uint32_t& aWidth,
                                                       const uint32_t& aHeight,
                                                       const uint32_t& aStride,
-                                                      const uint8_t& aFormat,
+                                                      const gfx::SurfaceFormat& aFormat,
                                                       const uint32_t& aHotspotX,
                                                       const uint32_t& aHotspotY,
                                                       const bool& aForce) override;
@@ -571,7 +571,7 @@ public:
   RecvInvokeDragSession(nsTArray<IPCDataTransfer>&& aTransfers,
                         const uint32_t& aAction,
                         const OptionalShmem& aVisualDnDData,
-                        const uint32_t& aStride, const uint8_t& aFormat,
+                        const uint32_t& aStride, const gfx::SurfaceFormat& aFormat,
                         const LayoutDeviceIntRect& aDragRect,
                         const nsCString& aPrincipalURISpec) override;
 
diff --git a/dom/quota/test/browser_permissionsPrompt.html b/dom/quota/test/browser_permissionsPrompt.html
index 473d70c53773..1962020e225c 100644
--- a/dom/quota/test/browser_permissionsPrompt.html
+++ b/dom/quota/test/browser_permissionsPrompt.html
@@ -13,8 +13,7 @@
         SpecialPowers.pushPrefEnv({
           "set": [["dom.storageManager.enabled", true],
                   ["dom.storageManager.prompt.testing", false],
-                  ["dom.storageManager.prompt.testing.allow", false],
-                  ["browser.storageManager.enabled", true]]
+                  ["dom.storageManager.prompt.testing.allow", false]]
         }, continueToNextStep);
         yield undefined;
 
diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp
index dff25bfa2af0..54e91dabd539 100644
--- a/layout/painting/nsDisplayList.cpp
+++ b/layout/painting/nsDisplayList.cpp
@@ -8364,9 +8364,14 @@ nsDisplayTransform::ShouldPrerenderTransformedContent(nsDisplayListBuilder* aBui
   nsSize absoluteLimit(aFrame->PresContext()->DevPixelsToAppUnits(absoluteLimitX),
                        aFrame->PresContext()->DevPixelsToAppUnits(absoluteLimitY));
   nsSize maxSize = Min(relativeLimit, absoluteLimit);
-  gfxSize scale = nsLayoutUtils::GetTransformToAncestorScale(aFrame);
-  nsSize frameSize(overflow.Size().width * scale.width,
-                   overflow.Size().height * scale.height);
+
+  const auto transform = nsLayoutUtils::GetTransformToAncestor(aFrame,
+    nsLayoutUtils::GetDisplayRootFrame(aFrame));
+  const gfxRect transformedBounds = transform.TransformAndClipBounds(
+    gfxRect(overflow.x, overflow.y, overflow.width, overflow.height),
+    gfxRect::MaxIntRect());
+  const nsSize frameSize = nsSize(transformedBounds.width, transformedBounds.height);
+
   uint64_t maxLimitArea = uint64_t(maxSize.width) * maxSize.height;
   uint64_t frameArea = uint64_t(frameSize.width) * frameSize.height;
   if (frameArea <= maxLimitArea && frameSize <= absoluteLimit) {
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 2e1abc58bb87..d76304175fd4 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5776,9 +5776,7 @@ pref("dom.storageManager.enabled", false);
 pref("dom.storageManager.prompt.testing", false);
 pref("dom.storageManager.prompt.testing.allow", false);
 
-// Enable the Storage management in about:preferences and persistent-storage permission request
-// To enable the DOM implementation, turn on "dom.storageManager.enabled"
-pref("browser.storageManager.enabled", true);
+
 pref("browser.storageManager.pressureNotification.minIntervalMS", 1200000);
 pref("browser.storageManager.pressureNotification.usageThresholdGB", 5);
 
diff --git a/testing/marionette/doc/Testing.md b/testing/marionette/doc/Testing.md
index b335fc00e0e8..4702b07bfdd6 100644
--- a/testing/marionette/doc/Testing.md
+++ b/testing/marionette/doc/Testing.md
@@ -1,17 +1,24 @@
-# Running Tests
+Running tests
+=============
 
-We verify and test Marionette in a couple of different ways.
-While for the server component XPCShell tests are used, the
-client and harness packages both use Python.
+We verify and test Marionette in a couple of different ways.  The
+server uses a combination of xpcshell unit tests and functional
+Python-based tests written with the Marionette harness and WPT; the
+client is tested with the same harness; and the Marionette test
+harness uses a collection of Python tests.
 
-For debugging test failures which are happing in CI, a one-click loaner from
-[Taskcluster](Taskcluster.html) can be used.
+Additionally, for debugging hard-to-reproduce test failures in CI,
+a one-click loaner from [Taskcluster] can be used.
 
-## Setting up the tests
+[TaskCluster]: Taskcluster.html
 
-Marionette-based tests can be run in-tree with a locally built
-or downloaded Firefox through `mach`, as well as with out-of-tree
-tests with `marionette`.
+
+Setup
+-----
+
+Marionette-based tests can be run through `mach` with a local
+checkout of _central_ and a build of Firefox, as well as out-of-tree
+with the `marionette` test harness.
 
 Running in-tree tests, `mach` will automatically manage the Python
 virtual environment in which your tests are run.  The Marionette
@@ -19,71 +26,73 @@ client that is picked up is the one that is in-tree at
 _testing/marionette/client_.
 
 If you want to run tests from a downloaded test archive, you will
-need to download the `target.common.tests.zip` artifact as attached to
-Treeherder [build jobs] `B` for your system.  Extract that file and set up
-the Python Marionette client and harness by executing the following
-command:
+need to download the `target.common.tests.zip` artifact as attached
+to Treeherder [build jobs] `B` for your system.  Extract that file
+and set up the Python Marionette client and harness by executing
+the following command in a virtual environment:
 
-    % pip install -r config/marionette_requirements.txt
+	% pip install -r config/marionette_requirements.txt
 
 The tests can then be found under
-*marionette/tests/testing/marionette/harness/marionette_harness/tests* and
-can be executed with the command `marionette`.  It supports the same options as
-described below for `mach`.
+_marionette/tests/testing/marionette/harness/marionette_harness/tests_ and
+can be executed with the command `marionette`.  It supports the
+same options as described below for `mach`.
 
 [build jobs]: https://treeherder.mozilla.org/#/jobs?repo=mozilla-central&filter-searchStr=build
 
 
-## XPCShell tests
+xpcshell unit tests
+-------------------
 
 Marionette has a set of [xpcshell] unit tests located in
 _testing/marionette/test*.js_.  These can be run this way:
 
-    % ./mach test testing/marionette/test_*.js
+	% ./mach test testing/marionette/test/unit
 
 Because tests are run in parallel and xpcshell itself is quite
 chatty, it can sometimes be useful to run the tests sequentially:
 
-    % ./mach test --sequential testing/marionette/test_error.js
+	% ./mach test --sequential testing/marionette/test/unit/test_error.js
 
 These unit tests run as part of the `X` jobs on Treeherder.
 
 [xpcshell]: https://developer.mozilla.org/en-US/docs/Mozilla/QA/Writing_xpcshell-based_unit_tests
 
 
-## Python functional tests
+Marionette functional tests
+---------------------------
 
 We also have a set of functional tests that make use of the Marionette
 Python client.  These start a Firefox process and tests the Marionette
-protocol input and output.  The following command will run all tests:
+protocol input and output.  The following command will run all
+tests:
 
-    % ./mach marionette-test
+	% ./mach marionette test
 
 But you can also run individual tests:
 
-    % ./mach marionette-test testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py
+	% ./mach marionette test testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py
 
-In case you want to run the tests with eg. a Nightly build of Firefox,
-mach let you do this with the --binary option:
+In case you want to run the tests with another Firefox binary:
 
-    % ./mach marionette-test --binary=/path/to/firefox-executable TEST
+	% ./mach marionette test --binary /path/to/firefox TEST
 
-When working on Marionette code it is often useful to surface the
-stdout from Firefox, which can be achived with the `--gecko-log` option.
-See [Debugging](Debugging.html) for usage instructions.
+When working on Marionette it is often useful to surface the stdout
+from Firefox, which can be achived using the `--gecko-log` option.
+See [Debugging] for usage instructions.
 
 As these are functional integration tests and pop up Firefox windows
-sporadically, a helpful tip is to surpress the window whilst you
+sporadically, a helpful tip is to suppress the window whilst you
 are running them by using Firefox’ [headless mode]:
 
-    % ./mach marionette-test -z TEST
+	% ./mach marionette test -z TEST
 
 `-z` is an alias for `--headless` and equivalent to setting the
-`MOZ_HEADLESS` output variable.  In addition to `MOZ_HEADLESS`
-there is also `MOZ_HEADLESS_WIDTH` and `MOZ_HEADLESS_HEIGHT` for
-controlling the dimensions of the no-op virtual display.  This is
-similar to using xvfb(1) which you may know from the X windowing system,
-but has the additional benefit of also working on macOS and Windows.
+`MOZ_HEADLESS` output variable.  In addition to `MOZ_HEADLESS` there
+is also `MOZ_HEADLESS_WIDTH` and `MOZ_HEADLESS_HEIGHT` for controlling
+the dimensions of the no-op virtual display.  This is similar to
+using xvfb(1) which you may know from the X windowing system, but
+has the additional benefit of also working on macOS and Windows.
 
 These functional tests will run as part of the `Mn` job on Treeherder.
 
@@ -92,20 +101,36 @@ Marionette protocol, Marionette is used as the backend for the
 [geckodriver] WebDriver implementation.  It is served by a WPT test
 suite which effectively tests conformance to the W3C specification.
 
+[Debugging]: Debugging.html
 [headless mode]: https://developer.mozilla.org/en-US/Firefox/Headless_mode
 [geckodriver]: ../geckodriver/README.md
 
 
-## Python harness tests
+WPT functional tests
+--------------------
+
+Marionette is also indirectly tested through [geckodriver] with
+WPT.  WPT tests for WebDriver turn up with the `Wd` try job and can
+be run this way:
+
+	% ./mach wpt testing/web-platform/tests/webdriver/tests
+
+This command supports a `--webdriver-arg '-vv'` argument which
+enables more detailed logging, as well as `--jsdebugger` for opening
+the Browser Toolbox.
+
+
+Harness tests
+-------------
 
 The Marionette harness Python package has a set of unit tests, which
-are written by using the [pytest] framework. The following command will
-run all tests:
+are written by using the [pytest] framework. The following command
+will run all tests:
 
-    % ./mach python-test testing/marionette/
+	% ./mach python-test testing/marionette/
 
 To run a specific test specify the full path to the module:
 
-    % ./mach python-test testing/marionette/harness/marionette_harness/tests/harness_unit/test_serve.py
+	% ./mach python-test testing/marionette/harness/marionette_harness/tests/harness_unit/test_serve.py
 
 [pytest]: https://docs.pytest.org/en/latest/
diff --git a/testing/marionette/moz.build b/testing/marionette/moz.build
index 4beb356578be..2d958f0d5d24 100644
--- a/testing/marionette/moz.build
+++ b/testing/marionette/moz.build
@@ -9,7 +9,7 @@ JS_PREFERENCE_FILES += ["prefs/marionette.js"]
 
 MARIONETTE_UNIT_MANIFESTS += ["harness/marionette_harness/tests/unit/unit-tests.ini"]
 MARIONETTE_WEBAPI_MANIFESTS += ["harness/marionette_harness/tests/webapi-tests.ini"]
-XPCSHELL_TESTS_MANIFESTS += ["unit.ini"]
+XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
 
 with Files("**"):
     BUG_COMPONENT = ("Testing", "Marionette")
diff --git a/testing/marionette/test/unit/.eslintrc.js b/testing/marionette/test/unit/.eslintrc.js
new file mode 100644
index 000000000000..4a7e7a8e8aa3
--- /dev/null
+++ b/testing/marionette/test/unit/.eslintrc.js
@@ -0,0 +1,13 @@
+"use strict";
+
+module.exports = {
+  "extends": ["plugin:mozilla/xpcshell-test"],
+  "rules": {
+    "camelcase": "off",
+    "max-len": ["error", 100, {
+      "ignoreStrings": true,
+      "ignoreTemplateLiterals": true,
+      "ignoreUrls": true,
+    }],
+  },
+};
diff --git a/testing/marionette/test/unit/README.md b/testing/marionette/test/unit/README.md
new file mode 100644
index 000000000000..a5f8d2df4760
--- /dev/null
+++ b/testing/marionette/test/unit/README.md
@@ -0,0 +1,14 @@
+To run the tests in this directory, from the top source directory,
+either invoke the test despatcher in mach:
+
+	% ./mach test testing/marionette/test/unit
+
+Or call out the harness specifically:
+
+	% ./mach xpcshell-test testing/marionette/test/unit
+
+The latter gives you the `--sequential` option which can be useful
+when debugging to prevent tests from running in parallel.
+
+When adding new tests you must make sure they are listed in
+xpcshell.ini, otherwise they will not run on try.
diff --git a/testing/marionette/test_action.js b/testing/marionette/test/unit/test_action.js
similarity index 95%
rename from testing/marionette/test_action.js
rename to testing/marionette/test/unit/test_action.js
index f98af81a391e..b76c8cf26675 100644
--- a/testing/marionette/test_action.js
+++ b/testing/marionette/test/unit/test_action.js
@@ -5,8 +5,7 @@
 "use strict";
 
 ChromeUtils.import("chrome://marionette/content/action.js");
-const {ContentWebElement} = ChromeUtils.import("chrome://marionette/content/element.js", {});
-ChromeUtils.import("chrome://marionette/content/error.js");
+const {InvalidArgumentError} = ChromeUtils.import("chrome://marionette/content/error.js", {});
 
 const XHTMLNS = "http://www.w3.org/1999/xhtml";
 
@@ -46,9 +45,9 @@ add_test(function test_processPointerParameters() {
     let message = `parametersData: [pointerType: ${parametersData.pointerType}]`;
     check(/Unknown pointerType/, message, parametersData);
   }
-  parametersData.pointerType = "mouse"; //TODO "pen";
+  parametersData.pointerType = "mouse"; // TODO "pen";
   deepEqual(action.PointerParameters.fromJSON(parametersData),
-      {pointerType: "mouse"}); //TODO action.PointerType.Pen});
+      {pointerType: "mouse"}); // TODO action.PointerType.Pen});
 
   run_next_test();
 });
@@ -72,7 +71,7 @@ add_test(function test_processPointerUpDownAction() {
 add_test(function test_validateActionDurationAndCoordinates() {
   let actionItem = {};
   let actionSequence = {id: "some_id"};
-  let check = function (type, subtype, message = undefined) {
+  let check = function(type, subtype, message = undefined) {
     message = message || `duration: ${actionItem.duration}, subtype: ${subtype}`;
     actionItem.type = subtype;
     actionSequence.type = type;
@@ -193,7 +192,7 @@ add_test(function test_processPointerMoveAction() {
 });
 
 add_test(function test_computePointerDestinationViewport() {
-  let act = { type: "pointerMove", x: 100, y: 200, origin: "viewport"};
+  let act = {type: "pointerMove", x: 100, y: 200, origin: "viewport"};
   let inputState = new action.InputState.Pointer(action.PointerType.Mouse);
   // these values should not affect the outcome
   inputState.x = "99";
@@ -206,7 +205,7 @@ add_test(function test_computePointerDestinationViewport() {
 });
 
 add_test(function test_computePointerDestinationPointer() {
-  let act = { type: "pointerMove", x: 100, y: 200, origin: "pointer"};
+  let act = {type: "pointerMove", x: 100, y: 200, origin: "pointer"};
   let inputState = new action.InputState.Pointer(action.PointerType.Mouse);
   inputState.x = 10;
   inputState.y = 99;
@@ -246,7 +245,7 @@ add_test(function test_processPointerAction() {
     type: "pointer",
     id: "some_id",
     parameters: {
-      pointerType: "mouse" //TODO "touch"
+      pointerType: "mouse", // TODO "touch"
     },
   };
   let actionItems = [
@@ -261,7 +260,7 @@ add_test(function test_processPointerAction() {
     {
       type: "pointerUp",
       button: 1,
-    }
+    },
   ];
   for (let expected of actionItems) {
     let actual = action.Action.fromJSON(actionSequence, expected);
@@ -303,7 +302,7 @@ add_test(function test_processPauseAction() {
 add_test(function test_processActionSubtypeValidation() {
   let actionItem = {type: "dancing"};
   let actionSequence = {id: "some_id"};
-  let check = function (regex) {
+  let check = function(regex) {
     let message = `type: ${actionSequence.type}, subtype: ${actionItem.type}`;
     checkErrors(regex, action.Action.fromJSON, [actionSequence, actionItem], message);
   };
@@ -366,7 +365,7 @@ add_test(function test_processInputSourceActionSequenceValidation() {
 });
 
 add_test(function test_processInputSourceActionSequence() {
-  let actionItem = { type: "pause", duration: 5};
+  let actionItem = {type: "pause", duration: 5};
   let actionSequence = {
     type: "none",
     id: "some id",
@@ -388,7 +387,7 @@ add_test(function test_processInputSourceActionSequencePointer() {
     id: "9",
     actions: [actionItem],
     parameters: {
-      pointerType: "mouse" // TODO "pen"
+      pointerType: "mouse", // TODO "pen"
     },
   };
   let expectedAction = new action.Action(
@@ -425,7 +424,7 @@ add_test(function test_processInputSourceActionSequenceInputStateMap() {
   let actionItem = {type: "pause", duration: 5000};
   let actionSequence = {
     type: "key",
-    id: id,
+    id,
     actions: [actionItem],
   };
   let wrongInputState = new action.InputState.Null();
@@ -455,13 +454,13 @@ add_test(function test_processPointerActionInputStateMap() {
   action.inputStateMap.clear();
 
   // TODO - uncomment once pen is supported
-  //wrongInputState = new action.InputState.Pointer("pen");
-  //action.inputStateMap.set(id, wrongInputState);
-  //checkErrors(
+  // wrongInputState = new action.InputState.Pointer("pen");
+  // action.inputStateMap.set(id, wrongInputState);
+  // checkErrors(
   //    /to be mapped to InputState whose subtype is/, action.processPointerAction,
   //    [id, parameters, a],
   //    `subtype ${parameters.pointerType} with ${wrongInputState.subtype} in inputState`);
-  //action.inputStateMap.clear();
+  // action.inputStateMap.clear();
 
   let rightInputState = new action.InputState.Pointer("mouse");
   action.inputStateMap.set(id, rightInputState);
@@ -541,7 +540,7 @@ add_test(function test_extractActionChain_twoAndThreeTicks() {
     id: "7",
     actions: mouseActionItems,
     parameters: {
-      pointerType: "mouse" //TODO "touch"
+      pointerType: "mouse", // TODO "touch"
     },
   };
   let keyActionItems = [
@@ -622,7 +621,7 @@ add_test(function test_computeTickDuration_noDurations() {
 // helpers
 function getTypeString(obj) {
   return Object.prototype.toString.call(obj);
-};
+}
 
 function checkErrors(regex, func, args, message) {
   if (typeof message == "undefined") {
@@ -630,4 +629,4 @@ function checkErrors(regex, func, args, message) {
   }
   Assert.throws(() => func.apply(this, args), InvalidArgumentError, message);
   Assert.throws(() => func.apply(this, args), regex, message);
-};
+}
diff --git a/testing/marionette/test_assert.js b/testing/marionette/test/unit/test_assert.js
similarity index 93%
rename from testing/marionette/test_assert.js
rename to testing/marionette/test/unit/test_assert.js
index 6da23ed09a07..8ad82ba0f9e4 100644
--- a/testing/marionette/test_assert.js
+++ b/testing/marionette/test/unit/test_assert.js
@@ -3,9 +3,18 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
+/* eslint-disable no-array-constructor, no-new-object */
 
 ChromeUtils.import("chrome://marionette/content/assert.js");
-ChromeUtils.import("chrome://marionette/content/error.js");
+const {
+  InvalidArgumentError,
+  InvalidSessionIDError,
+  JavaScriptError,
+  NoSuchWindowError,
+  SessionNotCreatedError,
+  UnexpectedAlertOpenError,
+  UnsupportedOperationError,
+} = ChromeUtils.import("chrome://marionette/content/error.js", {});
 
 add_test(function test_acyclic() {
   assert.acyclic({});
@@ -111,7 +120,7 @@ add_test(function test_number() {
 });
 
 add_test(function test_callable() {
-  assert.callable(function () {});
+  assert.callable(function() {});
   assert.callable(() => {});
 
   for (let typ of [undefined, "", true, {}, []]) {
@@ -224,3 +233,5 @@ add_test(function test_that() {
 
   run_next_test();
 });
+
+/* eslint-enable no-array-constructor, no-new-object */
diff --git a/testing/marionette/test_browser.js b/testing/marionette/test/unit/test_browser.js
similarity index 100%
rename from testing/marionette/test_browser.js
rename to testing/marionette/test/unit/test_browser.js
diff --git a/testing/marionette/test_cookie.js b/testing/marionette/test/unit/test_cookie.js
similarity index 85%
rename from testing/marionette/test_cookie.js
rename to testing/marionette/test/unit/test_cookie.js
index da114440c847..6e0b6d0f62ff 100644
--- a/testing/marionette/test_cookie.js
+++ b/testing/marionette/test/unit/test_cookie.js
@@ -7,25 +7,25 @@ ChromeUtils.import("chrome://marionette/content/cookie.js");
 cookie.manager = {
   cookies: [],
 
-  add: function (domain, path, name, value, secure, httpOnly, session, expiry, originAttributes) {
+  add(domain, path, name, value, secure, httpOnly, session, expiry, originAttributes) {
     if (name === "fail") {
       throw new Error("An error occurred while adding cookie");
     }
     let newCookie = {
       host: domain,
-      path: path,
-      name: name,
-      value: value,
+      path,
+      name,
+      value,
       isSecure: secure,
       isHttpOnly: httpOnly,
       isSession: session,
-      expiry: expiry,
-      originAttributes: originAttributes,
+      expiry,
+      originAttributes,
     };
     cookie.manager.cookies.push(newCookie);
   },
 
-  remove: function (host, name, path, blocked, originAttributes) {
+  remove(host, name, path) {
     for (let i = 0; i < this.cookies.length; ++i) {
       let candidate = this.cookies[i];
       if (candidate.host === host &&
@@ -37,17 +37,17 @@ cookie.manager = {
     return false;
   },
 
-  getCookiesFromHost(host, originAttributes = {}) {
+  getCookiesFromHost(host) {
     let hostCookies = this.cookies.filter(cookie => cookie.host === host ||
        cookie.host === "." + host);
     let nextIndex = 0;
 
     return {
-      hasMoreElements () {
+      hasMoreElements() {
         return nextIndex < hostCookies.length;
       },
 
-      getNext () {
+      getNext() {
         return {
           QueryInterface() {
             return hostCookies[nextIndex++];
@@ -72,59 +72,59 @@ add_test(function test_fromJSON() {
 
   // domain
   for (let invalidType of [42, true, [], {}, null]) {
-    let test = {
+    let domainTest = {
       name: "foo",
       value: "bar",
-      domain: invalidType
+      domain: invalidType,
     };
-    Assert.throws(() => cookie.fromJSON(test), /Cookie domain must be string/);
+    Assert.throws(() => cookie.fromJSON(domainTest), /Cookie domain must be string/);
   }
-  let test = {
+  let domainTest = {
     name: "foo",
     value: "bar",
-    domain: "domain"
+    domain: "domain",
   };
-  let parsedCookie = cookie.fromJSON(test);
+  let parsedCookie = cookie.fromJSON(domainTest);
   equal(parsedCookie.domain, "domain");
 
   // path
   for (let invalidType of [42, true, [], {}, null]) {
-    let test = {
+    let pathTest = {
       name: "foo",
       value: "bar",
       path: invalidType,
     };
-    Assert.throws(() => cookie.fromJSON(test), /Cookie path must be string/);
+    Assert.throws(() => cookie.fromJSON(pathTest), /Cookie path must be string/);
   }
 
   // secure
   for (let invalidType of ["foo", 42, [], {}, null]) {
-    let test = {
+    let secureTest = {
       name: "foo",
       value: "bar",
       secure: invalidType,
     };
-    Assert.throws(() => cookie.fromJSON(test), /Cookie secure flag must be boolean/);
+    Assert.throws(() => cookie.fromJSON(secureTest), /Cookie secure flag must be boolean/);
   }
 
   // httpOnly
   for (let invalidType of ["foo", 42, [], {}, null]) {
-    let test = {
+    let httpOnlyTest = {
       name: "foo",
       value: "bar",
       httpOnly: invalidType,
     };
-    Assert.throws(() => cookie.fromJSON(test), /Cookie httpOnly flag must be boolean/);
+    Assert.throws(() => cookie.fromJSON(httpOnlyTest), /Cookie httpOnly flag must be boolean/);
   }
 
   // expiry
   for (let invalidType of [-1, Number.MAX_SAFE_INTEGER + 1, "foo", true, [], {}, null]) {
-    let test = {
+    let expiryTest = {
       name: "foo",
       value: "bar",
       expiry: invalidType,
     };
-    Assert.throws(() => cookie.fromJSON(test), /Cookie expiry must be a positive integer/);
+    Assert.throws(() => cookie.fromJSON(expiryTest), /Cookie expiry must be a positive integer/);
   }
 
   // bare requirements
@@ -213,12 +213,12 @@ add_test(function test_add() {
   cookie.add({
     name: "name6",
     value: "value",
-    domain: ".domain"
+    domain: ".domain",
   });
   equal(".domain", cookie.manager.cookies[4].host);
 
   Assert.throws(() => {
-    cookie.add({name: "fail", value: "value6", domain: "domain6"})
+    cookie.add({name: "fail", value: "value6", domain: "domain6"});
   }, /UnableToSetCookieError/);
 
   run_next_test();
@@ -231,7 +231,7 @@ add_test(function test_remove() {
     name: "test_remove",
     value: "value",
     domain: "domain",
-    path: "/custom/path"
+    path: "/custom/path",
   };
 
   equal(0, cookie.manager.cookies.length);
diff --git a/testing/marionette/test_dom.js b/testing/marionette/test/unit/test_dom.js
similarity index 89%
rename from testing/marionette/test_dom.js
rename to testing/marionette/test/unit/test_dom.js
index 7fcf7d9bab82..b9678c9b600d 100644
--- a/testing/marionette/test_dom.js
+++ b/testing/marionette/test/unit/test_dom.js
@@ -23,11 +23,11 @@ class Window {
     this.events = [];
   }
 
-  addEventListener(type, listener) {
+  addEventListener(type) {
     this.events.push(type);
   }
 
-  removeEventListener(type, listener) {
+  removeEventListener(type) {
     for (let i = 0; i < this.events.length; ++i) {
       if (this.events[i] === type) {
         this.events.splice(i, 1);
@@ -56,8 +56,8 @@ add_test(function test_addEventListener() {
   // click listener was appended
   equal(Object.keys(eventTarget.listeners).length, 1);
   ok("click" in eventTarget.listeners);
-  equal(eventTarget.listeners["click"].length, 1);
-  equal(eventTarget.listeners["click"][0], listener);
+  equal(eventTarget.listeners.click.length, 1);
+  equal(eventTarget.listeners.click[0], listener);
 
   // should have sent a registration message
   deepEqual(
@@ -77,7 +77,7 @@ add_test(function test_addEventListener_sameReference() {
   let listener = () => {};
   eventTarget.addEventListener("click", listener);
   eventTarget.addEventListener("click", listener);
-  equal(eventTarget.listeners["click"].length, 1);
+  equal(eventTarget.listeners.click.length, 1);
 
   run_next_test();
 });
@@ -87,10 +87,10 @@ add_test(function test_WebElementEventTarget_addEventListener_once() {
   let eventTarget = new WebElementEventTarget(ipc);
 
   eventTarget.addEventListener("click", () => {}, {once: true});
-  equal(eventTarget.listeners["click"][0].once, true);
+  equal(eventTarget.listeners.click[0].once, true);
 
   eventTarget.dispatchEvent({type: "click"});
-  equal(eventTarget.listeners["click"].length, 0);
+  equal(eventTarget.listeners.click.length, 0);
   deepEqual(
       ipc.sent[1], {
         name: "Marionette:DOM:RemoveEventListener",
@@ -111,26 +111,26 @@ add_test(function test_WebElementEventTarget_removeEventListener() {
 
   let firstListener = () => {};
   eventTarget.addEventListener("click", firstListener);
-  equal(eventTarget.listeners["click"].length, 1);
-  ok(eventTarget.listeners["click"][0] === firstListener);
+  equal(eventTarget.listeners.click.length, 1);
+  ok(eventTarget.listeners.click[0] === firstListener);
 
   let secondListener = () => {};
   eventTarget.addEventListener("click", secondListener);
-  equal(eventTarget.listeners["click"].length, 2);
-  ok(eventTarget.listeners["click"][1] === secondListener);
+  equal(eventTarget.listeners.click.length, 2);
+  ok(eventTarget.listeners.click[1] === secondListener);
 
-  ok(eventTarget.listeners["click"][0] !== eventTarget.listeners["click"][1]);
+  ok(eventTarget.listeners.click[0] !== eventTarget.listeners.click[1]);
 
   eventTarget.removeEventListener("click", secondListener);
-  equal(eventTarget.listeners["click"].length, 1);
-  ok(eventTarget.listeners["click"][0] === firstListener);
+  equal(eventTarget.listeners.click.length, 1);
+  ok(eventTarget.listeners.click[0] === firstListener);
 
   // event should not have been unregistered
   // because there still exists another click event
   equal(ipc.sent[ipc.sent.length - 1].name, "Marionette:DOM:AddEventListener");
 
   eventTarget.removeEventListener("click", firstListener);
-  equal(eventTarget.listeners["click"].length, 0);
+  equal(eventTarget.listeners.click.length, 0);
   deepEqual(
       ipc.sent[ipc.sent.length - 1],
       {
diff --git a/testing/marionette/test_element.js b/testing/marionette/test/unit/test_element.js
similarity index 100%
rename from testing/marionette/test_element.js
rename to testing/marionette/test/unit/test_element.js
diff --git a/testing/marionette/test_error.js b/testing/marionette/test/unit/test_error.js
similarity index 93%
rename from testing/marionette/test_error.js
rename to testing/marionette/test/unit/test_error.js
index e958221b18a8..525118ff4aee 100644
--- a/testing/marionette/test_error.js
+++ b/testing/marionette/test/unit/test_error.js
@@ -213,13 +213,13 @@ add_test(function test_ElementClickInterceptedError() {
     nodeType: 1,
     localName: "b",
     ownerDocument: {
-      elementFromPoint: function (x, y) {
+      elementFromPoint() {
         return otherEl;
       },
     },
     style: {
       pointerEvents: "auto",
-    }
+    },
   };
 
   let err1 = new ElementClickInterceptedError(obscuredEl, {x: 1, y: 2});
@@ -260,6 +260,16 @@ add_test(function test_ElementNotInteractableError() {
   run_next_test();
 });
 
+add_test(function test_InsecureCertificateError() {
+  let err = new InsecureCertificateError("foo");
+  equal("InsecureCertificateError", err.name);
+  equal("foo", err.message);
+  equal("insecure certificate", err.status);
+  ok(err instanceof WebDriverError);
+
+  run_next_test();
+});
+
 add_test(function test_InvalidArgumentError() {
   let err = new InvalidArgumentError("foo");
   equal("InvalidArgumentError", err.name);
@@ -327,6 +337,16 @@ add_test(function test_JavaScriptError() {
   run_next_test();
 });
 
+add_test(function test_MoveTargetOutOfBoundsError() {
+  let err = new MoveTargetOutOfBoundsError("foo");
+  equal("MoveTargetOutOfBoundsError", err.name);
+  equal("foo", err.message);
+  equal("move target out of bounds", err.status);
+  ok(err instanceof WebDriverError);
+
+  run_next_test();
+});
+
 add_test(function test_NoSuchAlertError() {
   let err = new NoSuchAlertError("foo");
   equal("NoSuchAlertError", err.name);
@@ -417,6 +437,16 @@ add_test(function test_UnableToSetCookieError() {
   run_next_test();
 });
 
+add_test(function test_UnexpectedAlertOpenError() {
+  let err = new UnexpectedAlertOpenError("foo");
+  equal("UnexpectedAlertOpenError", err.name);
+  equal("foo", err.message);
+  equal("unexpected alert open", err.status);
+  ok(err instanceof WebDriverError);
+
+  run_next_test();
+});
+
 add_test(function test_UnknownCommandError() {
   let err = new UnknownCommandError("foo");
   equal("UnknownCommandError", err.name);
diff --git a/testing/marionette/test_evaluate.js b/testing/marionette/test/unit/test_evaluate.js
similarity index 97%
rename from testing/marionette/test_evaluate.js
rename to testing/marionette/test/unit/test_evaluate.js
index 8fd183704b44..ffbad2e6f7fc 100644
--- a/testing/marionette/test_evaluate.js
+++ b/testing/marionette/test/unit/test_evaluate.js
@@ -85,7 +85,7 @@ add_test(function test_toJSON_types() {
 
 
 add_test(function test_toJSON_sequences() {
-  let input = [null, true, [], domEl, {toJSON() { return "foo"}}, {bar: "baz"}];
+  let input = [null, true, [], domEl, {toJSON() { return "foo"; }}, {bar: "baz"}];
   let actual = evaluate.toJSON(input, seenEls);
 
   equal(null, actual[0]);
diff --git a/testing/marionette/test_format.js b/testing/marionette/test/unit/test_format.js
similarity index 96%
rename from testing/marionette/test_format.js
rename to testing/marionette/test/unit/test_format.js
index 582f8fdb4048..513d13154e78 100644
--- a/testing/marionette/test_format.js
+++ b/testing/marionette/test/unit/test_format.js
@@ -35,7 +35,7 @@ add_test(function test_pprint() {
     type: "t",
   };
   equal('<input id="foo" class="a b" href="#" name="bar" src="s" type="t">',
-        pprint`${el}`);
+      pprint`${el}`);
 
   run_next_test();
 });
@@ -88,12 +88,12 @@ add_test(function test_truncate_object() {
   equal(truncate`${{foo: ["bar", {baz: 42}]}}`, JSON.stringify({foo: ["bar", {baz: 42}]}));
 
   let complex = {
-    toString() { return "hello world"; }
+    toString() { return "hello world"; },
   };
   equal(truncate`${complex}`, "hello world");
 
   let longComplex = {
-    toString() { return "x".repeat(260); }
+    toString() { return "x".repeat(260); },
   };
   equal(truncate`${longComplex}`, `${HALF} ... ${HALF}`);
 
diff --git a/testing/marionette/test_message.js b/testing/marionette/test/unit/test_message.js
similarity index 96%
rename from testing/marionette/test_message.js
rename to testing/marionette/test/unit/test_message.js
index 0744ab715839..b4ef5753c19c 100644
--- a/testing/marionette/test_message.js
+++ b/testing/marionette/test/unit/test_message.js
@@ -2,7 +2,10 @@
  * 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/. */
 
-ChromeUtils.import("chrome://marionette/content/error.js");
+const {
+  InvalidArgumentError,
+  WebDriverError,
+} = ChromeUtils.import("chrome://marionette/content/error.js", {});
 ChromeUtils.import("chrome://marionette/content/message.js");
 
 add_test(function test_Message_Origin() {
@@ -125,10 +128,10 @@ add_test(function test_Response_ctor() {
 add_test(function test_Response_sendConditionally() {
   let fired = false;
   let resp = new Response(42, () => fired = true);
-  resp.sendConditionally(r => false);
+  resp.sendConditionally(() => false);
   equal(false, resp.sent);
   equal(false, fired);
-  resp.sendConditionally(r => true);
+  resp.sendConditionally(() => true);
   equal(true, resp.sent);
   equal(true, fired);
 
diff --git a/testing/marionette/test_navigate.js b/testing/marionette/test/unit/test_navigate.js
similarity index 100%
rename from testing/marionette/test_navigate.js
rename to testing/marionette/test/unit/test_navigate.js
diff --git a/testing/marionette/test_session.js b/testing/marionette/test/unit/test_session.js
similarity index 95%
rename from testing/marionette/test_session.js
rename to testing/marionette/test/unit/test_session.js
index 9545d82da9c5..b61d446598eb 100644
--- a/testing/marionette/test_session.js
+++ b/testing/marionette/test/unit/test_session.js
@@ -7,7 +7,7 @@
 ChromeUtils.import("resource://gre/modules/Preferences.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
-ChromeUtils.import("chrome://marionette/content/error.js");
+const {InvalidArgumentError} = ChromeUtils.import("chrome://marionette/content/error.js", {});
 ChromeUtils.import("chrome://marionette/content/session.js");
 
 add_test(function test_Timeouts_ctor() {
@@ -197,7 +197,7 @@ add_test(function test_Proxy_toJSON() {
   deepEqual(p.toJSON(), {proxyType: "manual"});
 
   for (let proxy of ["ftpProxy", "httpProxy", "sslProxy", "socksProxy"]) {
-    let expected = {proxyType: "manual"}
+    let expected = {proxyType: "manual"};
 
     p = new session.Proxy();
     p.proxyType = "manual";
@@ -209,7 +209,7 @@ add_test(function test_Proxy_toJSON() {
 
     // without port
     p[proxy] = "foo";
-    expected[proxy] = "foo"
+    expected[proxy] = "foo";
     deepEqual(p.toJSON(), expected);
 
     // with port
@@ -219,13 +219,13 @@ add_test(function test_Proxy_toJSON() {
     deepEqual(p.toJSON(), expected);
 
     p[`${proxy}Port`] = 42;
-    expected[proxy] = "foo:42"
+    expected[proxy] = "foo:42";
     deepEqual(p.toJSON(), expected);
 
     // add brackets for IPv6 address as proxy hostname
     p[proxy] = "2001:db8::1";
     p[`${proxy}Port`] = 42;
-    expected[proxy] = "foo:42"
+    expected[proxy] = "foo:42";
     expected[proxy] = "[2001:db8::1]:42";
     deepEqual(p.toJSON(), expected);
   }
@@ -276,8 +276,8 @@ add_test(function test_Proxy_fromJSON() {
 
     // invalid hosts
     for (let host of [true, 42, [], {}, null, "http://foo",
-        "foo:-1", "foo:65536", "foo/test", "foo#42", "foo?foo=bar",
-        "2001:db8::1"]) {
+      "foo:-1", "foo:65536", "foo/test", "foo#42", "foo?foo=bar",
+      "2001:db8::1"]) {
       manual[proxy] = host;
       Assert.throws(() => session.Proxy.fromJSON(manual),
           /InvalidArgumentError/);
@@ -304,8 +304,8 @@ add_test(function test_Proxy_fromJSON() {
     for (let host in host_map) {
       manual[proxy] = host;
 
-      p[`${proxy}`] = host_map[host]["hostname"];
-      p[`${proxy}Port`] = host_map[host]["port"];
+      p[`${proxy}`] = host_map[host].hostname;
+      p[`${proxy}Port`] = host_map[host].port;
 
       deepEqual(p, session.Proxy.fromJSON(manual));
     }
@@ -320,7 +320,7 @@ add_test(function test_Proxy_fromJSON() {
         p[`${proxy}Port`] = null;
       } else {
         let default_ports = {"ftpProxy": 21, "httpProxy": 80,
-           "sslProxy": 443};
+          "sslProxy": 443};
 
         p[`${proxy}Port`] = default_ports[proxy];
       }
@@ -338,7 +338,7 @@ add_test(function test_Proxy_fromJSON() {
   for (let noProxy of [true, 42, {}, null, "foo",
       [true], [42], [{}], [null]]) {
     Assert.throws(() => session.Proxy.fromJSON(
-        {proxyType: "manual", noProxy: noProxy}),
+        {proxyType: "manual", noProxy}),
         /InvalidArgumentError/);
   }
 
@@ -346,7 +346,7 @@ add_test(function test_Proxy_fromJSON() {
   p = new session.Proxy();
   p.proxyType = "manual";
   for (let noProxy of [[], ["foo"], ["foo", "bar"], ["127.0.0.1"]]) {
-    let manual = {proxyType: "manual", "noProxy": noProxy}
+    let manual = {proxyType: "manual", "noProxy": noProxy};
     p.noProxy = noProxy;
     deepEqual(p, session.Proxy.fromJSON(manual));
   }
@@ -355,7 +355,7 @@ add_test(function test_Proxy_fromJSON() {
   p = new session.Proxy();
   p.proxyType = "manual";
   p.noProxy = ["2001:db8::1"];
-  let manual = {proxyType: "manual", "noProxy": ["[2001:db8::1]"]}
+  let manual = {proxyType: "manual", "noProxy": ["[2001:db8::1]"]};
   deepEqual(p, session.Proxy.fromJSON(manual));
 
   run_next_test();
@@ -408,7 +408,7 @@ add_test(function test_Capabilities_toJSON() {
   equal(caps.get("moz:processID"), json["moz:processID"]);
   equal(caps.get("moz:profile"), json["moz:profile"]);
   equal(caps.get("moz:useNonSpecCompliantPointerOrigin"),
-        json["moz:useNonSpecCompliantPointerOrigin"]);
+      json["moz:useNonSpecCompliantPointerOrigin"]);
   equal(caps.get("moz:webdriverClick"), json["moz:webdriverClick"]);
 
   run_next_test();
diff --git a/testing/marionette/test_sync.js b/testing/marionette/test/unit/test_sync.js
similarity index 100%
rename from testing/marionette/test_sync.js
rename to testing/marionette/test/unit/test_sync.js
diff --git a/testing/marionette/unit.ini b/testing/marionette/test/unit/xpcshell.ini
similarity index 100%
rename from testing/marionette/unit.ini
rename to testing/marionette/test/unit/xpcshell.ini
diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js
index 718d7c4d6dc8..0b7cfc96d640 100644
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -34,6 +34,7 @@ user_pref("devtools.devedition.promo.enabled", false);
 user_pref("devtools.chrome.enabled", false);
 user_pref("devtools.debugger.remote-enabled", false);
 user_pref("devtools.debugger.prompt-connection", true);
+user_pref("devtools.testing", true);
 user_pref("browser.EULA.override", true);
 user_pref("gfx.color_management.force_srgb", true);
 user_pref("gfx.logging.level", 1);
diff --git a/testing/web-platform/meta/storage/storagemanager-persist.https.html.ini b/testing/web-platform/meta/storage/storagemanager-persist.https.html.ini
index f0efadd35e52..9acaa0449f97 100644
--- a/testing/web-platform/meta/storage/storagemanager-persist.https.html.ini
+++ b/testing/web-platform/meta/storage/storagemanager-persist.https.html.ini
@@ -1,2 +1,2 @@
 [storagemanager-persist.https.html]
-  prefs: [browser.storageManager.enabled:true, dom.storageManager.prompt.testing:true]
+  prefs: [dom.storageManager.prompt.testing:true]
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_unlimitedStorage.html b/toolkit/components/extensions/test/mochitest/test_ext_unlimitedStorage.html
index fab23615fdfb..c45d1231a5b9 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_unlimitedStorage.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_unlimitedStorage.html
@@ -20,8 +20,6 @@ add_task(async function test_background_storagePersist() {
   await SpecialPowers.pushPrefEnv({
     "set": [
       ["dom.storageManager.enabled", true],
-      // Enable the storageManager permission prompt.
-      ["browser.storageManager.enabled", true],
       ["dom.storageManager.prompt.testing", false],
       ["dom.storageManager.prompt.testing.allow", false],
     ],
diff --git a/toolkit/crashreporter/test/moz.build b/toolkit/crashreporter/test/moz.build
old mode 100644
new mode 100755
index 34900d09f09b..5b98ff9a58d5
--- a/toolkit/crashreporter/test/moz.build
+++ b/toolkit/crashreporter/test/moz.build
@@ -25,9 +25,10 @@ SOURCES += [
 ]
 
 if CONFIG['OS_TARGET'] == 'WINNT' and CONFIG['CPU_ARCH'] == 'x86_64':
-    SOURCES += [
-        'win64UnwindInfoTests.asm',
-    ]
+    if CONFIG['CC_TYPE'] != 'gcc':
+        SOURCES += [
+            'win64UnwindInfoTests.asm',
+        ]
 
 if CONFIG['CC_TYPE'] == 'clang-cl':
     SOURCES['ExceptionThrower.cpp'].flags += [
diff --git a/toolkit/crashreporter/test/nsTestCrasher.cpp b/toolkit/crashreporter/test/nsTestCrasher.cpp
old mode 100644
new mode 100755
index 4c0223cdde65..ac7638742330
--- a/toolkit/crashreporter/test/nsTestCrasher.cpp
+++ b/toolkit/crashreporter/test/nsTestCrasher.cpp
@@ -1,6 +1,7 @@
 #include "mozilla/Assertions.h"
 
 #include <stdio.h>
+#include <map>
 
 #include "nscore.h"
 #include "mozilla/Unused.h"
@@ -45,7 +46,7 @@ void PureVirtualCall()
 }
 
 extern "C" {
-#if XP_WIN && HAVE_64BIT_BUILD
+#if XP_WIN && HAVE_64BIT_BUILD && !defined(__MINGW32__)
   // Implementation in win64unwindInfoTests.asm
   uint64_t x64CrashCFITest_NO_MANS_LAND(uint64_t returnpfn, void*);
   uint64_t x64CrashCFITest_Launcher(uint64_t returnpfn, void* testProc);
@@ -59,7 +60,7 @@ extern "C" {
   uint64_t x64CrashCFITest_SAVE_XMM128_FAR(uint64_t returnpfn, void*);
   uint64_t x64CrashCFITest_EPILOG(uint64_t returnpfn, void*);
   uint64_t x64CrashCFITest_EOF(uint64_t returnpfn, void*);
-#endif // XP_WIN && HAVE_64BIT_BUILD
+#endif // XP_WIN && HAVE_64BIT_BUILD && !defined(__MINGW32__)
 }
 
 // Keep these in sync with CrashTestUtils.jsm!
@@ -82,7 +83,7 @@ const int16_t CRASH_X64CFI_SAVE_XMM128_FAR = 18;
 const int16_t CRASH_X64CFI_EPILOG         = 19;
 const int16_t CRASH_X64CFI_EOF            = 20;
 
-#if XP_WIN && HAVE_64BIT_BUILD
+#if XP_WIN && HAVE_64BIT_BUILD && !defined(__MINGW32__)
 
 typedef decltype(&x64CrashCFITest_UnknownOpcode) win64CFITestFnPtr_t;
 
@@ -158,7 +159,7 @@ void Crash(int16_t how)
     ThrowException();
     break;
   }
-#if XP_WIN && HAVE_64BIT_BUILD
+#if XP_WIN && HAVE_64BIT_BUILD && !defined(__MINGW32__)
   case CRASH_X64CFI_UNKNOWN_OPCODE:
   case CRASH_X64CFI_PUSH_NONVOL:
   case CRASH_X64CFI_ALLOC_SMALL:
@@ -178,7 +179,7 @@ void Crash(int16_t how)
     pfnLauncher(0, pfnTest);
     break;
   }
-#endif // XP_WIN && HAVE_64BIT_BUILD
+#endif // XP_WIN && HAVE_64BIT_BUILD && !defined(__MINGW32__)
   default:
     break;
   }
@@ -217,7 +218,7 @@ void TryOverrideExceptionHandler()
 
 extern "C" NS_EXPORT uint32_t
 GetWin64CFITestFnAddrOffset(int16_t fnid) {
-#if XP_WIN && HAVE_64BIT_BUILD
+#if XP_WIN && HAVE_64BIT_BUILD && !defined(__MINGW32__)
   // fnid uses the same constants as Crash().
   // Returns the RVA of the requested function.
   // Returns 0 on failure.
@@ -229,5 +230,5 @@ GetWin64CFITestFnAddrOffset(int16_t fnid) {
   return ((uint64_t)m[fnid]) - moduleBase;
 #else
   return 0;
-#endif // XP_WIN && HAVE_64BIT_BUILD
+#endif // XP_WIN && HAVE_64BIT_BUILD && !defined(__MINGW32__)
 }
diff --git a/widget/PuppetWidget.cpp b/widget/PuppetWidget.cpp
index c89b13d974f3..9f12748b2cfd 100644
--- a/widget/PuppetWidget.cpp
+++ b/widget/PuppetWidget.cpp
@@ -1034,7 +1034,7 @@ PuppetWidget::SetCursor(imgIContainer* aCursor,
   nsDependentCString cursorData(surfaceData.get(), length);
   mozilla::gfx::IntSize size = dataSurface->GetSize();
   if (!mTabChild->SendSetCustomCursor(cursorData, size.width, size.height, stride,
-                                      static_cast<uint8_t>(dataSurface->GetFormat()),
+                                      dataSurface->GetFormat(),
                                       aHotspotX, aHotspotY, mUpdateCursor)) {
     return NS_ERROR_FAILURE;
   }
diff --git a/widget/nsDragServiceProxy.cpp b/widget/nsDragServiceProxy.cpp
index 4135fe50e5c2..facbe7a78c3a 100644
--- a/widget/nsDragServiceProxy.cpp
+++ b/widget/nsDragServiceProxy.cpp
@@ -95,7 +95,7 @@ nsDragServiceProxy::InvokeDragSessionImpl(nsIArray* aArrayTransferables,
 
         mozilla::Unused <<
           child->SendInvokeDragSession(dataTransfers, aActionType, surfaceData,
-                                       stride, static_cast<uint8_t>(dataSurface->GetFormat()),
+                                       stride, dataSurface->GetFormat(),
                                        dragRect, principalURISpec);
         StartDragSession();
         return NS_OK;
@@ -104,7 +104,7 @@ nsDragServiceProxy::InvokeDragSessionImpl(nsIArray* aArrayTransferables,
   }
 
   mozilla::Unused << child->SendInvokeDragSession(dataTransfers, aActionType,
-                                                  mozilla::void_t(), 0, 0, dragRect,
+                                                  mozilla::void_t(), 0, static_cast<gfx::SurfaceFormat>(0), dragRect,
                                                   principalURISpec);
   StartDragSession();
   return NS_OK;