Backed out changeset c6b267589d0d (bug 1202902) for Mulet Reftest, W3C Platform Test and other failures. r=backout a=backout on a CLOSED TREE

accessible/tests/mochitest/relations.js

@@ -1,26 +1,26 @@
 ////////////////////////////////////////////////////////////////////////////////
 // Constants
 
-var RELATION_CONTROLLED_BY = nsIAccessibleRelation.RELATION_CONTROLLED_BY;
+const RELATION_CONTROLLED_BY = nsIAccessibleRelation.RELATION_CONTROLLED_BY;
-var RELATION_CONTROLLER_FOR = nsIAccessibleRelation.RELATION_CONTROLLER_FOR;
+const RELATION_CONTROLLER_FOR = nsIAccessibleRelation.RELATION_CONTROLLER_FOR;
-var RELATION_DEFAULT_BUTTON = nsIAccessibleRelation.RELATION_DEFAULT_BUTTON;
+const RELATION_DEFAULT_BUTTON = nsIAccessibleRelation.RELATION_DEFAULT_BUTTON;
-var RELATION_DESCRIBED_BY = nsIAccessibleRelation.RELATION_DESCRIBED_BY;
+const RELATION_DESCRIBED_BY = nsIAccessibleRelation.RELATION_DESCRIBED_BY;
-var RELATION_DESCRIPTION_FOR = nsIAccessibleRelation.RELATION_DESCRIPTION_FOR;
+const RELATION_DESCRIPTION_FOR = nsIAccessibleRelation.RELATION_DESCRIPTION_FOR;
-var RELATION_EMBEDDED_BY = nsIAccessibleRelation.RELATION_EMBEDDED_BY;
+const RELATION_EMBEDDED_BY = nsIAccessibleRelation.RELATION_EMBEDDED_BY;
-var RELATION_EMBEDS = nsIAccessibleRelation.RELATION_EMBEDS;
+const RELATION_EMBEDS = nsIAccessibleRelation.RELATION_EMBEDS;
-var RELATION_FLOWS_FROM = nsIAccessibleRelation.RELATION_FLOWS_FROM;
+const RELATION_FLOWS_FROM = nsIAccessibleRelation.RELATION_FLOWS_FROM;
-var RELATION_FLOWS_TO = nsIAccessibleRelation.RELATION_FLOWS_TO;
+const RELATION_FLOWS_TO = nsIAccessibleRelation.RELATION_FLOWS_TO;
-var RELATION_LABEL_FOR = nsIAccessibleRelation.RELATION_LABEL_FOR;
+const RELATION_LABEL_FOR = nsIAccessibleRelation.RELATION_LABEL_FOR;
-var RELATION_LABELLED_BY = nsIAccessibleRelation.RELATION_LABELLED_BY;
+const RELATION_LABELLED_BY = nsIAccessibleRelation.RELATION_LABELLED_BY;
-var RELATION_MEMBER_OF = nsIAccessibleRelation.RELATION_MEMBER_OF;
+const RELATION_MEMBER_OF = nsIAccessibleRelation.RELATION_MEMBER_OF;
-var RELATION_NODE_CHILD_OF = nsIAccessibleRelation.RELATION_NODE_CHILD_OF;
+const RELATION_NODE_CHILD_OF = nsIAccessibleRelation.RELATION_NODE_CHILD_OF;
-var RELATION_NODE_PARENT_OF = nsIAccessibleRelation.RELATION_NODE_PARENT_OF;
+const RELATION_NODE_PARENT_OF = nsIAccessibleRelation.RELATION_NODE_PARENT_OF;
-var RELATION_PARENT_WINDOW_OF = nsIAccessibleRelation.RELATION_PARENT_WINDOW_OF;
+const RELATION_PARENT_WINDOW_OF = nsIAccessibleRelation.RELATION_PARENT_WINDOW_OF;
-var RELATION_POPUP_FOR = nsIAccessibleRelation.RELATION_POPUP_FOR;
+const RELATION_POPUP_FOR = nsIAccessibleRelation.RELATION_POPUP_FOR;
-var RELATION_SUBWINDOW_OF = nsIAccessibleRelation.RELATION_SUBWINDOW_OF;
+const RELATION_SUBWINDOW_OF = nsIAccessibleRelation.RELATION_SUBWINDOW_OF;
-var RELATION_CONTAINING_DOCUMENT = nsIAccessibleRelation.RELATION_CONTAINING_DOCUMENT;
+const RELATION_CONTAINING_DOCUMENT = nsIAccessibleRelation.RELATION_CONTAINING_DOCUMENT;
-var RELATION_CONTAINING_TAB_PANE = nsIAccessibleRelation.RELATION_CONTAINING_TAB_PANE;
+const RELATION_CONTAINING_TAB_PANE = nsIAccessibleRelation.RELATION_CONTAINING_TAB_PANE;
-var RELATION_CONTAINING_APPLICATION = nsIAccessibleRelation.RELATION_CONTAINING_APPLICATION;
+const RELATION_CONTAINING_APPLICATION = nsIAccessibleRelation.RELATION_CONTAINING_APPLICATION;
 
 ////////////////////////////////////////////////////////////////////////////////
 // General

addon-sdk/source/test/fixtures/addon/bootstrap.js

@@ -6,4 +6,4 @@
 const { utils: Cu } = Components;
 const {require} = Cu.import(`${ROOT}/toolkit/require.js`, {});
 const {Bootstrap} = require(`${ROOT}/sdk/addon/bootstrap.js`);
-var {startup, shutdown, install, uninstall} = new Bootstrap();
+const {startup, shutdown, install, uninstall} = new Bootstrap();

addon-sdk/source/test/test-content-script.js

@@ -727,7 +727,7 @@ exports["test requestAnimationFrame"] = createProxyTest("", function (helper) {
 exports["testGlobalScope"] = createProxyTest("", function (helper) {
 
   helper.createWorker(
-    'var toplevelScope = true;' +
+    'let toplevelScope = true;' +
     'assert(window.toplevelScope, "variables in toplevel scope are set to `window` object");' +
     'assert(this.toplevelScope, "variables in toplevel scope are set to `this` object");' +
     'done();'

browser/base/content/browser.js

@@ -3722,8 +3722,6 @@ const BrowserSearch = {
   }
 };
 
-XPCOMUtils.defineConstant(this, "BrowserSearch", BrowserSearch);
-
 function FillHistoryMenu(aParent) {
   // Lazily add the hover listeners on first showing and never remove them
   if (!aParent.hasStatusListener) {

browser/base/content/test/general/healthreport_pingData.js

@@ -1,4 +1,4 @@
-var TEST_PINGS = [
+const TEST_PINGS = [
   {
     type: "test-telemetryArchive-1",
     payload: { foo: "bar" },

browser/base/content/urlbarBindings.xml

@@ -1594,11 +1594,9 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
         document.getElementById("addon-progress-notification-progresstext");
       </field>
       <field name="DownloadUtils" readonly="true">
-        {
+        let utils = {};
-          let utils = {};
+        Components.utils.import("resource://gre/modules/DownloadUtils.jsm", utils);
-          Components.utils.import("resource://gre/modules/DownloadUtils.jsm", utils);
+        utils.DownloadUtils;
-          utils.DownloadUtils;
-        }
       </field>
 
       <method name="destroy">
@@ -2678,13 +2676,11 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
       ]]></destructor>
 
       <field name="_panel" readonly="true"><![CDATA[
-        {
+        let node = this.parentNode;
-          let node = this.parentNode;
+        while(node && node.localName != "panel") {
-          while(node && node.localName != "panel") {
+          node = node.parentNode;
-            node = node.parentNode;
-          }
-          node;
         }
+        node;
       ]]></field>
       <field name="_promomessage" readonly="true">
         document.getAnonymousElementByAttribute(this, "anonid", "promo-message");

browser/components/customizableui/content/panelUI.js

@@ -510,8 +510,6 @@ const PanelUI = {
   },
 };
 
-XPCOMUtils.defineConstant(this, "PanelUI", PanelUI);
-
 /**
  * Gets the currently selected locale for display.
  * @return  the selected locale or "en-US" if none is selected

browser/components/customizableui/test/browser_1096763_seen_widgets_post_reset.js

@@ -9,18 +9,17 @@ add_task(function*() {
     defaultArea: CustomizableUI.AREA_NAVBAR
   });
 
-  const kPrefCustomizationState = "browser.uiCustomization.state";
   let bsPass = Cu.import("resource:///modules/CustomizableUI.jsm", {});
   ok(bsPass.gSeenWidgets.has(BUTTONID), "Widget should be seen after createWidget is called.");
   CustomizableUI.reset();
   ok(bsPass.gSeenWidgets.has(BUTTONID), "Widget should still be seen after reset.");
-  ok(!Services.prefs.prefHasUserValue(kPrefCustomizationState), "Pref shouldn't be set right now, because that'd break undo.");
+  ok(!Services.prefs.prefHasUserValue(bsPass.kPrefCustomizationState), "Pref shouldn't be set right now, because that'd break undo.");
   CustomizableUI.addWidgetToArea(BUTTONID, CustomizableUI.AREA_NAVBAR);
   gCustomizeMode.removeFromArea(document.getElementById(BUTTONID));
-  let hasUserValue = Services.prefs.prefHasUserValue(kPrefCustomizationState);
+  let hasUserValue = Services.prefs.prefHasUserValue(bsPass.kPrefCustomizationState);
   ok(hasUserValue, "Pref should be set right now.");
   if (hasUserValue) {
-    let seenArray = JSON.parse(Services.prefs.getCharPref(kPrefCustomizationState)).seen;
+    let seenArray = JSON.parse(Services.prefs.getCharPref(bsPass.kPrefCustomizationState)).seen;
     isnot(seenArray.indexOf(BUTTONID), -1, "Widget should be in saved 'seen' list.");
   }
 });

browser/components/downloads/content/downloads.js

@@ -580,8 +580,6 @@ const DownloadsPanel = {
   },
 };
 
-XPCOMUtils.defineConstant(this, "DownloadsPanel", DownloadsPanel);
-
 ////////////////////////////////////////////////////////////////////////////////
 //// DownloadsOverlayLoader
 
@@ -660,8 +658,6 @@ const DownloadsOverlayLoader = {
   },
 };
 
-XPCOMUtils.defineConstant(this, "DownloadsOverlayLoader", DownloadsOverlayLoader);
-
 ////////////////////////////////////////////////////////////////////////////////
 //// DownloadsView
 
@@ -1008,8 +1004,6 @@ const DownloadsView = {
   },
 }
 
-XPCOMUtils.defineConstant(this, "DownloadsView", DownloadsView);
-
 ////////////////////////////////////////////////////////////////////////////////
 //// DownloadsViewItem
 
@@ -1148,8 +1142,6 @@ const DownloadsViewController = {
   }
 };
 
-XPCOMUtils.defineConstant(this, "DownloadsViewController", DownloadsViewController);
-
 ////////////////////////////////////////////////////////////////////////////////
 //// DownloadsViewItemController
 
@@ -1496,9 +1488,7 @@ const DownloadsSummary = {
     delete this._detailsNode;
     return this._detailsNode = node;
   }
-};
+}
-
-XPCOMUtils.defineConstant(this, "DownloadsSummary", DownloadsSummary);
 
 ////////////////////////////////////////////////////////////////////////////////
 //// DownloadsFooter
@@ -1552,5 +1542,3 @@ const DownloadsFooter = {
     return this._footerNode = node;
   }
 };
-
-XPCOMUtils.defineConstant(this, "DownloadsFooter", DownloadsFooter);

browser/components/downloads/content/indicator.js

@@ -577,8 +577,3 @@ const DownloadsIndicatorView = {
   },
 };
 
-Object.defineProperty(this, "DownloadsIndicatorView", {
-  value: DownloadsIndicatorView,
-  enumerable: true,
-  writable: false
-});

browser/components/loop/modules/LoopRoomsCache.jsm

@@ -17,7 +17,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm
 this.EXPORTED_SYMBOLS = ["LoopRoomsCache"];
 
 const LOOP_ROOMS_CACHE_FILENAME = "loopRoomsCache.json";
-XPCOMUtils.defineConstant(this, "LOOP_ROOMS_CACHE_FILENAME", LOOP_ROOMS_CACHE_FILENAME);
 
 /**
  * RoomsCache is a cache for saving simple rooms data to the disk in case we

browser/components/loop/modules/MozLoopService.jsm

@@ -112,14 +112,6 @@ this.EXPORTED_SYMBOLS = ["MozLoopService", "LOOP_SESSION_TYPE",
   "TWO_WAY_MEDIA_CONN_LENGTH", "SHARING_STATE_CHANGE", "SHARING_ROOM_URL",
   "ROOM_CREATE", "ROOM_DELETE", "ROOM_CONTEXT_ADD"];
 
-XPCOMUtils.defineConstant(this, "LOOP_SESSION_TYPE", LOOP_SESSION_TYPE);
-XPCOMUtils.defineConstant(this, "TWO_WAY_MEDIA_CONN_LENGTH", TWO_WAY_MEDIA_CONN_LENGTH);
-XPCOMUtils.defineConstant(this, "SHARING_STATE_CHANGE", SHARING_STATE_CHANGE);
-XPCOMUtils.defineConstant(this, "SHARING_ROOM_URL", SHARING_ROOM_URL);
-XPCOMUtils.defineConstant(this, "ROOM_CREATE", ROOM_CREATE);
-XPCOMUtils.defineConstant(this, "ROOM_DELETE", ROOM_DELETE);
-XPCOMUtils.defineConstant(this, "ROOM_CONTEXT_ADD", ROOM_CONTEXT_ADD);
-
 XPCOMUtils.defineLazyModuleGetter(this, "injectLoopAPI",
   "resource:///modules/loop/MozLoopAPI.jsm");
 

browser/components/sessionstore/test/browser_privatetabs.js

@@ -1,6 +1,10 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+var Imports = {};
+Cu.import("resource:///modules/sessionstore/SessionSaver.jsm", Imports);
+var {SessionSaver} = Imports;
+
 add_task(function cleanup() {
   info("Forgetting closed tabs");
   while (ss.getClosedTabCount(window)) {

browser/experiments/Experiments.jsm

@@ -94,7 +94,6 @@ const TELEMETRY_LOG = {
     RECHECK: "RECHECK",
   },
 };
-XPCOMUtils.defineConstant(this, "TELEMETRY_LOG", TELEMETRY_LOG);
 
 const gPrefs = new Preferences(PREF_BRANCH);
 const gPrefsTelemetry = new Preferences(PREF_BRANCH_TELEMETRY);

browser/modules/Windows8WindowFrameColor.jsm

@@ -11,7 +11,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 var Registry = Cu.import("resource://gre/modules/WindowsRegistry.jsm").WindowsRegistry;
 
-var Windows8WindowFrameColor = {
+const Windows8WindowFrameColor = {
   _windowFrameColor: null,
 
   get: function() {

devtools/client/canvasdebugger/canvasdebugger.js

@@ -77,7 +77,6 @@ const EVENTS = {
   SOURCE_SHOWN_IN_JS_DEBUGGER: "CanvasDebugger:SourceShownInJsDebugger",
   SOURCE_NOT_FOUND_IN_JS_DEBUGGER: "CanvasDebugger:SourceNotFoundInJsDebugger"
 };
-XPCOMUtils.defineConstant(this, "EVENTS", EVENTS);
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
 const STRINGS_URI = "chrome://browser/locale/devtools/canvasdebugger.properties";

devtools/client/debugger/debugger-controller.js

@@ -104,7 +104,6 @@ Cu.import("resource:///modules/devtools/client/shared/widgets/ViewHelpers.jsm");
 
 Cu.import("resource:///modules/devtools/client/shared/browser-loader.js");
 const require = BrowserLoader("resource:///modules/devtools/client/debugger/", this).require;
-XPCOMUtils.defineConstant(this, "require", require);
 
 const {TargetFactory} = require("devtools/client/framework/target");
 const {Toolbox} = require("devtools/client/framework/toolbox");
@@ -115,8 +114,6 @@ const DebuggerEditor = require("devtools/client/sourceeditor/debugger");
 const {Tooltip} = require("devtools/client/shared/widgets/Tooltip");
 const FastListWidget = require("devtools/client/shared/widgets/FastListWidget");
 
-XPCOMUtils.defineConstant(this, "EVENTS", EVENTS);
-
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
   "resource://gre/modules/Task.jsm");
 

devtools/client/debugger/debugger-view.js

@@ -49,19 +49,6 @@ const services = {
 const EventListenersView = require('./content/views/event-listeners-view');
 const actions = require('./content/actions/event-listeners');
 
-Object.defineProperties(this, {
-  "store": {
-    value: store,
-    enumerable: true,
-    writable: false
-  },
-  "services": {
-    value: services,
-    enumerable: true,
-    writable: false
-  }
-});
-
 /**
  * Object defining the debugger view components.
  */

devtools/client/debugger/test/mochitest/browser_dbg_break-on-next-console.js

@@ -40,13 +40,11 @@ function test() {
     let updatedFrame = yield waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_SCOPES);
     let variables = gDebugger.DebuggerView.Variables;
 
-    is(variables._store.length, 3, "Correct number of scopes available");
+    is(variables._store.length, 2, "Correct number of scopes available");
     is(variables.getScopeAtIndex(0).name, "With scope [Object]",
         "Paused with correct scope (0)");
-    is(variables.getScopeAtIndex(1).name, "Block scope",
+    is(variables.getScopeAtIndex(1).name, "Global scope [Window]",
         "Paused with correct scope (1)");
-    is(variables.getScopeAtIndex(2).name, "Global scope [Window]",
-        "Paused with correct scope (2)");
 
     let onceResumed = gTarget.once("thread-resumed");
     EventUtils.sendMouseEvent({ type: "mousedown" }, gResumeButton, gDebugger);

devtools/client/debugger/test/mochitest/browser_dbg_break-on-next.js

@@ -49,15 +49,13 @@ function test() {
     let updatedFrame = yield waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_SCOPES);
     let variables = gDebugger.DebuggerView.Variables;
 
-    is(variables._store.length, 4, "Correct number of scopes available");
+    is(variables._store.length, 3, "Correct number of scopes available");
     is(variables.getScopeAtIndex(0).name, "Function scope [interval<]",
         "Paused with correct scope (0)");
     is(variables.getScopeAtIndex(1).name, "Block scope",
         "Paused with correct scope (1)");
-    is(variables.getScopeAtIndex(2).name, "Block scope",
+    is(variables.getScopeAtIndex(2).name, "Global scope [Window]",
         "Paused with correct scope (2)");
-    is(variables.getScopeAtIndex(3).name, "Global scope [Window]",
-        "Paused with correct scope (3)");
 
     yield evalInTab(gTab, "clearInterval(interval)");
     let onceResumed = gTarget.once("thread-resumed");
@@ -78,21 +76,15 @@ function test() {
     let updatedFrame = yield waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_SCOPES);
     let variables = gDebugger.DebuggerView.Variables;
 
-    is(variables._store.length, 6, "Correct number of scopes available");
+    is(variables._store.length, 4, "Correct number of scopes available");
     is(variables.getScopeAtIndex(0).name, "Function scope [onclick]",
         "Paused with correct scope (0)");
-    // Non-syntactic lexical scope introduced by non-syntactic scope chain.
+    is(variables.getScopeAtIndex(1).name, "With scope [HTMLButtonElement]",
-    is(variables.getScopeAtIndex(1).name, "Block scope",
         "Paused with correct scope (1)");
-    is(variables.getScopeAtIndex(2).name, "With scope [HTMLButtonElement]",
+    is(variables.getScopeAtIndex(2).name, "With scope [HTMLDocument]",
         "Paused with correct scope (2)");
-    is(variables.getScopeAtIndex(3).name, "With scope [HTMLDocument]",
+    is(variables.getScopeAtIndex(3).name, "Global scope [Window]",
         "Paused with correct scope (3)");
-    // Global lexical scope.
-    is(variables.getScopeAtIndex(4).name, "Block scope",
-        "Paused with correct scope (4)");
-    is(variables.getScopeAtIndex(5).name, "Global scope [Window]",
-        "Paused with correct scope (5)");
 
     let onceResumed = gTarget.once("thread-resumed");
     EventUtils.sendMouseEvent({ type: "mousedown" }, gResumeButton, gDebugger);

devtools/client/debugger/test/mochitest/browser_dbg_pause-exceptions-01.js

@@ -53,8 +53,8 @@ function testPauseOnExceptionsDisabled() {
 
     is(gFrames.itemCount, 1,
       "Should have one frame.");
-    is(gVariables._store.length, 4,
+    is(gVariables._store.length, 3,
-      "Should have four scopes.");
+      "Should have three scopes.");
 
     is(innerNodes[0].querySelector(".name").getAttribute("value"), "this",
       "Should have the right property name for 'this'.");
@@ -96,8 +96,8 @@ function testPauseOnExceptionsEnabled() {
 
     is(gFrames.itemCount, 1,
       "Should have one frame.");
-    is(gVariables._store.length, 4,
+    is(gVariables._store.length, 3,
-      "Should have four scopes.");
+      "Should have three scopes.");
 
     is(innerNodes[0].querySelector(".name").getAttribute("value"), "<exception>",
       "Should have the right property name for <exception>.");
@@ -117,8 +117,8 @@ function testPauseOnExceptionsEnabled() {
 
       is(gFrames.itemCount, 1,
         "Should have one frame.");
-      is(gVariables._store.length, 4,
+      is(gVariables._store.length, 3,
-        "Should have four scopes.");
+        "Should have three scopes.");
 
       is(innerNodes[0].querySelector(".name").getAttribute("value"), "this",
         "Should have the right property name for 'this'.");

devtools/client/debugger/test/mochitest/browser_dbg_pause-exceptions-02.js

@@ -52,8 +52,8 @@ function testPauseOnExceptionsAfterReload() {
 
     is(gFrames.itemCount, 1,
       "Should have one frame.");
-    is(gVariables._store.length, 4,
+    is(gVariables._store.length, 3,
-      "Should have four scopes.");
+      "Should have three scopes.");
 
     is(innerNodes[0].querySelector(".name").getAttribute("value"), "<exception>",
       "Should have the right property name for <exception>.");
@@ -73,8 +73,8 @@ function testPauseOnExceptionsAfterReload() {
 
       is(gFrames.itemCount, 1,
         "Should have one frame.");
-      is(gVariables._store.length, 4,
+      is(gVariables._store.length, 3,
-        "Should have four scopes.");
+        "Should have three scopes.");
 
       is(innerNodes[0].querySelector(".name").getAttribute("value"), "this",
         "Should have the right property name for 'this'.");

devtools/client/debugger/test/mochitest/browser_dbg_variables-view-06.js

@@ -7,7 +7,7 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_promise.html";
 
-var test = Task.async(function* () {
+const test = Task.async(function* () {
   const [tab,, panel] = yield initDebugger(TAB_URL);
   yield ensureSourceIs(panel, "doc_promise.html", true);
 

devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-01.js

@@ -44,8 +44,7 @@ function testVariablesAndPropertiesFiltering() {
   let localScope = gVariables.getScopeAtIndex(0);
   let withScope = gVariables.getScopeAtIndex(1);
   let functionScope = gVariables.getScopeAtIndex(2);
-  let globalLexicalScope = gVariables.getScopeAtIndex(3);
+  let globalScope = gVariables.getScopeAtIndex(3);
-  let globalScope = gVariables.getScopeAtIndex(4);
   let protoVar = localScope.get("__proto__");
   let constrVar = protoVar.get("constructor");
   let proto2Var = constrVar.get("__proto__");
@@ -58,8 +57,6 @@ function testVariablesAndPropertiesFiltering() {
       "The withScope should be expanded.");
     is(functionScope.expanded, true,
       "The functionScope should be expanded.");
-    is(globalLexicalScope.expanded, true,
-      "The globalLexicalScope should be expanded.");
     is(globalScope.expanded, true,
       "The globalScope should be expanded.");
 
@@ -78,8 +75,6 @@ function testVariablesAndPropertiesFiltering() {
       "There should be 0 variables displayed in the with scope.");
     is(functionScope.target.querySelectorAll(".variables-view-variable:not([unmatched])").length, 0,
       "There should be 0 variables displayed in the function scope.");
-    is(globalLexicalScope.target.querySelectorAll(".variables-view-variable:not([unmatched])").length, 0,
-      "There should be 0 variables displayed in the global lexical scope.");
     is(globalScope.target.querySelectorAll(".variables-view-variable:not([unmatched])").length, 0,
       "There should be 0 variables displayed in the global scope.");
 
@@ -87,8 +82,6 @@ function testVariablesAndPropertiesFiltering() {
       "There should be 0 properties displayed in the with scope.");
     is(functionScope.target.querySelectorAll(".variables-view-property:not([unmatched])").length, 0,
       "There should be 0 properties displayed in the function scope.");
-    is(globalLexicalScope.target.querySelectorAll(".variables-view-property:not([unmatched])").length, 0,
-      "There should be 0 properties displayed in the global lexical scope.");
     is(globalScope.target.querySelectorAll(".variables-view-property:not([unmatched])").length, 0,
       "There should be 0 properties displayed in the global scope.");
 
@@ -113,7 +106,6 @@ function testVariablesAndPropertiesFiltering() {
     localScope.collapse();
     withScope.collapse();
     functionScope.collapse();
-    globalLexicalScope.collapse();
     globalScope.collapse();
     protoVar.collapse();
     constrVar.collapse();
@@ -126,8 +118,6 @@ function testVariablesAndPropertiesFiltering() {
       "The withScope should not be expanded.");
     is(functionScope.expanded, false,
       "The functionScope should not be expanded.");
-    is(globalLexicalScope.expanded, false,
-      "The globalLexicalScope should not be expanded.");
     is(globalScope.expanded, false,
       "The globalScope should not be expanded.");
 
@@ -155,17 +145,14 @@ function prepareVariablesAndProperties() {
   let localScope = gVariables.getScopeAtIndex(0);
   let withScope = gVariables.getScopeAtIndex(1);
   let functionScope = gVariables.getScopeAtIndex(2);
-  let globalLexicalScope = gVariables.getScopeAtIndex(3);
+  let globalScope = gVariables.getScopeAtIndex(3);
-  let globalScope = gVariables.getScopeAtIndex(4);
 
   is(localScope.expanded, true,
     "The localScope should be expanded.");
   is(withScope.expanded, false,
     "The withScope should not be expanded yet.");
   is(functionScope.expanded, false,
-     "The functionScope should not be expanded yet.");
+    "The functionScope should not be expanded yet.");
-  is(globalLexicalScope.expanded, false,
-     "The globalLexicalScope should not be expanded yet.");
   is(globalScope.expanded, false,
     "The globalScope should not be expanded yet.");
 
@@ -177,9 +164,7 @@ function prepareVariablesAndProperties() {
     is(withScope.expanded, true,
       "The withScope should now be expanded.");
     is(functionScope.expanded, true,
-       "The functionScope should now be expanded.");
+      "The functionScope should now be expanded.");
-    is(globalLexicalScope.expanded, true,
-       "The globalLexicalScope should be expanded.");
     is(globalScope.expanded, true,
       "The globalScope should now be expanded.");
 
@@ -221,7 +206,6 @@ function prepareVariablesAndProperties() {
 
   withScope.expand();
   functionScope.expand();
-  globalLexicalScope.expand();
   globalScope.expand();
 
   return deferred.promise;

devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-02.js

@@ -44,8 +44,7 @@ function testVariablesAndPropertiesFiltering() {
   let localScope = gVariables.getScopeAtIndex(0);
   let withScope = gVariables.getScopeAtIndex(1);
   let functionScope = gVariables.getScopeAtIndex(2);
-  let globalLexicalScope = gVariables.getScopeAtIndex(3);
+  let globalScope = gVariables.getScopeAtIndex(3);
-  let globalScope = gVariables.getScopeAtIndex(4);
   let protoVar = localScope.get("__proto__");
   let constrVar = protoVar.get("constructor");
   let proto2Var = constrVar.get("__proto__");
@@ -58,8 +57,6 @@ function testVariablesAndPropertiesFiltering() {
       "The withScope should be expanded.");
     is(functionScope.expanded, true,
       "The functionScope should be expanded.");
-    is(globalLexicalScope.expanded, true,
-      "The globalScope should be expanded.");
     is(globalScope.expanded, true,
       "The globalScope should be expanded.");
 
@@ -78,8 +75,6 @@ function testVariablesAndPropertiesFiltering() {
       "There should be 0 variables displayed in the with scope.");
     is(functionScope.target.querySelectorAll(".variables-view-variable:not([unmatched])").length, 0,
       "There should be 0 variables displayed in the function scope.");
-    is(globalLexicalScope.target.querySelectorAll(".variables-view-variable:not([unmatched])").length, 0,
-      "There should be no variables displayed in the global lexical scope.");
     is(globalScope.target.querySelectorAll(".variables-view-variable:not([unmatched])").length, 0,
       "There should be no variables displayed in the global scope.");
 
@@ -89,8 +84,6 @@ function testVariablesAndPropertiesFiltering() {
       "There should be 0 properties displayed in the with scope.");
     is(functionScope.target.querySelectorAll(".variables-view-property:not([unmatched])").length, 0,
       "There should be 0 properties displayed in the function scope.");
-    is(globalLexicalScope.target.querySelectorAll(".variables-view-property:not([unmatched])").length, 0,
-      "There should be 0 properties displayed in the global lexical scope.");
     is(globalScope.target.querySelectorAll(".variables-view-property:not([unmatched])").length, 0,
       "There should be 0 properties displayed in the global scope.");
 
@@ -120,7 +113,6 @@ function testVariablesAndPropertiesFiltering() {
     localScope.collapse();
     withScope.collapse();
     functionScope.collapse();
-    globalLexicalScope.collapse();
     globalScope.collapse();
     protoVar.collapse();
     constrVar.collapse();
@@ -133,8 +125,6 @@ function testVariablesAndPropertiesFiltering() {
       "The withScope should not be expanded.");
     is(functionScope.expanded, false,
       "The functionScope should not be expanded.");
-    is(globalLexicalScope.expanded, false,
-      "The globalScope should not be expanded.");
     is(globalScope.expanded, false,
       "The globalScope should not be expanded.");
 
@@ -163,8 +153,7 @@ function prepareVariablesAndProperties() {
   let localScope = gVariables.getScopeAtIndex(0);
   let withScope = gVariables.getScopeAtIndex(1);
   let functionScope = gVariables.getScopeAtIndex(2);
-  let globalLexicalScope = gVariables.getScopeAtIndex(3);
+  let globalScope = gVariables.getScopeAtIndex(3);
-  let globalScope = gVariables.getScopeAtIndex(4);
 
   is(localScope.expanded, true,
     "The localScope should be expanded.");
@@ -172,8 +161,6 @@ function prepareVariablesAndProperties() {
     "The withScope should not be expanded yet.");
   is(functionScope.expanded, false,
     "The functionScope should not be expanded yet.");
-  is(globalLexicalScope.expanded, false,
-    "The globalScope should not be expanded yet.");
   is(globalScope.expanded, false,
     "The globalScope should not be expanded yet.");
 
@@ -186,8 +173,6 @@ function prepareVariablesAndProperties() {
       "The withScope should now be expanded.");
     is(functionScope.expanded, true,
       "The functionScope should now be expanded.");
-    is(globalLexicalScope.expanded, true,
-      "The globalScope should now be expanded.");
     is(globalScope.expanded, true,
       "The globalScope should now be expanded.");
 
@@ -229,7 +214,6 @@ function prepareVariablesAndProperties() {
 
   withScope.expand();
   functionScope.expand();
-  globalLexicalScope.expand();
   globalScope.expand();
 
   return deferred.promise;

devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-03.js

@@ -43,8 +43,7 @@ function testVariablesAndPropertiesFiltering() {
   let localScope = gVariables.getScopeAtIndex(0);
   let withScope = gVariables.getScopeAtIndex(1);
   let functionScope = gVariables.getScopeAtIndex(2);
-  let globalLexicalScope = gVariables.getScopeAtIndex(3);
+  let globalScope = gVariables.getScopeAtIndex(3);
-  let globalScope = gVariables.getScopeAtIndex(4);
 
   function testFiltered() {
     is(localScope.expanded, true,
@@ -53,8 +52,6 @@ function testVariablesAndPropertiesFiltering() {
       "The withScope should be expanded.");
     is(functionScope.expanded, true,
       "The functionScope should be expanded.");
-    is(globalLexicalScope.expanded, true,
-      "The globalScope should be expanded.");
     is(globalScope.expanded, true,
       "The globalScope should be expanded.");
 
@@ -64,8 +61,6 @@ function testVariablesAndPropertiesFiltering() {
       "There should be 0 variables displayed in the with scope.");
     is(functionScope.target.querySelectorAll(".variables-view-variable:not([unmatched])").length, 0,
       "There should be 0 variables displayed in the function scope.");
-    is(globalLexicalScope.target.querySelectorAll(".variables-view-variable:not([unmatched])").length, 0,
-      "There should be 0 variables displayed in the global scope.");
     is(globalScope.target.querySelectorAll(".variables-view-variable:not([unmatched])").length, 0,
       "There should be 0 variables displayed in the global scope.");
 
@@ -75,8 +70,6 @@ function testVariablesAndPropertiesFiltering() {
       "There should be 0 properties displayed in the with scope.");
     is(functionScope.target.querySelectorAll(".variables-view-property:not([unmatched])").length, 0,
       "There should be 0 properties displayed in the function scope.");
-    is(globalLexicalScope.target.querySelectorAll(".variables-view-property:not([unmatched])").length, 0,
-      "There should be 0 properties displayed in the global scope.");
     is(globalScope.target.querySelectorAll(".variables-view-property:not([unmatched])").length, 0,
       "There should be 0 properties displayed in the global scope.");
   }
@@ -93,7 +86,6 @@ function testVariablesAndPropertiesFiltering() {
     localScope.collapse();
     withScope.collapse();
     functionScope.collapse();
-    globalLexicalScope.collapse();
     globalScope.collapse();
 
     is(localScope.expanded, false,
@@ -102,8 +94,6 @@ function testVariablesAndPropertiesFiltering() {
       "The withScope should not be expanded.");
     is(functionScope.expanded, false,
       "The functionScope should not be expanded.");
-    is(globalLexicalScope.expanded, false,
-      "The globalScope should not be expanded.");
     is(globalScope.expanded, false,
       "The globalScope should not be expanded.");
 
@@ -125,8 +115,7 @@ function prepareVariablesAndProperties() {
   let localScope = gVariables.getScopeAtIndex(0);
   let withScope = gVariables.getScopeAtIndex(1);
   let functionScope = gVariables.getScopeAtIndex(2);
-  let globalLexicalScope = gVariables.getScopeAtIndex(3);
+  let globalScope = gVariables.getScopeAtIndex(3);
-  let globalScope = gVariables.getScopeAtIndex(4);
 
   is(localScope.expanded, true,
     "The localScope should be expanded.");
@@ -134,8 +123,6 @@ function prepareVariablesAndProperties() {
     "The withScope should not be expanded yet.");
   is(functionScope.expanded, false,
     "The functionScope should not be expanded yet.");
-  is(globalLexicalScope.expanded, false,
-    "The globalScope should not be expanded yet.");
   is(globalScope.expanded, false,
     "The globalScope should not be expanded yet.");
 
@@ -148,8 +135,6 @@ function prepareVariablesAndProperties() {
       "The withScope should now be expanded.");
     is(functionScope.expanded, true,
       "The functionScope should now be expanded.");
-    is(globalLexicalScope.expanded, true,
-      "The globalScope should now be expanded.");
     is(globalScope.expanded, true,
       "The globalScope should now be expanded.");
 
@@ -158,7 +143,6 @@ function prepareVariablesAndProperties() {
 
   withScope.expand();
   functionScope.expand();
-  globalLexicalScope.expand();
   globalScope.expand();
 
   return deferred.promise;

devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-04.js

@@ -44,110 +44,108 @@ function testVariablesAndPropertiesFiltering() {
   let localScope = gVariables.getScopeAtIndex(0);
   let withScope = gVariables.getScopeAtIndex(1);
   let functionScope = gVariables.getScopeAtIndex(2);
-  let globalLexicalScope = gVariables.getScopeAtIndex(3);
+  let globalScope = gVariables.getScopeAtIndex(3);
-  let globalScope = gVariables.getScopeAtIndex(4);
   let step = 0;
 
   let tests = [
     function() {
-      assertExpansion([true, false, false, false, false]);
+      assertExpansion([true, false, false, false]);
       EventUtils.sendKey("RETURN", gDebugger);
     },
     function() {
-      assertExpansion([true, false, false, false, false]);
+      assertExpansion([true, false, false, false]);
       EventUtils.sendKey("RETURN", gDebugger);
     },
     function() {
-      assertExpansion([true, false, false, false, false]);
+      assertExpansion([true, false, false, false]);
       gEditor.focus();
     },
     function() {
-      assertExpansion([true, false, false, false, false]);
+      assertExpansion([true, false, false, false]);
       typeText(gSearchBox, "*");
     },
     function() {
-      assertExpansion([true, true, true, true, true]);
+      assertExpansion([true, true, true, true]);
       EventUtils.sendKey("RETURN", gDebugger);
     },
     function() {
-      assertExpansion([true, true, true, true, true]);
+      assertExpansion([true, true, true, true]);
       EventUtils.sendKey("RETURN", gDebugger);
     },
     function() {
-      assertExpansion([true, true, true, true, true]);
+      assertExpansion([true, true, true, true]);
       gEditor.focus();
     },
     function() {
-      assertExpansion([true, true, true, true, true]);
+      assertExpansion([true, true, true, true]);
       backspaceText(gSearchBox, 1);
     },
     function() {
-      assertExpansion([true, true, true, true, true]);
+      assertExpansion([true, true, true, true]);
       EventUtils.sendKey("RETURN", gDebugger);
     },
     function() {
-      assertExpansion([true, true, true, true, true]);
+      assertExpansion([true, true, true, true]);
       EventUtils.sendKey("RETURN", gDebugger);
     },
     function() {
-      assertExpansion([true, true, true, true, true]);
+      assertExpansion([true, true, true, true]);
       gEditor.focus();
     },
     function() {
-      assertExpansion([true, true, true, true, true]);
+      assertExpansion([true, true, true, true]);
       localScope.collapse();
       withScope.collapse();
       functionScope.collapse();
-      globalLexicalScope.collapse();
       globalScope.collapse();
     },
     function() {
-      assertExpansion([false, false, false, false, false]);
+      assertExpansion([false, false, false, false]);
       EventUtils.sendKey("RETURN", gDebugger);
     },
     function() {
-      assertExpansion([false, false, false, false, false]);
+      assertExpansion([false, false, false, false]);
       EventUtils.sendKey("RETURN", gDebugger);
     },
     function() {
-      assertExpansion([false, false, false, false, false]);
+      assertExpansion([false, false, false, false]);
       gEditor.focus();
     },
     function() {
-      assertExpansion([false, false, false, false, false]);
+      assertExpansion([false, false, false, false]);
       clearText(gSearchBox);
       typeText(gSearchBox, "*");
     },
     function() {
-      assertExpansion([true, true, true, true, true]);
+      assertExpansion([true, true, true, true]);
       EventUtils.sendKey("RETURN", gDebugger);
     },
     function() {
-      assertExpansion([true, true, true, true, true]);
+      assertExpansion([true, true, true, true]);
       EventUtils.sendKey("RETURN", gDebugger);
     },
     function() {
-      assertExpansion([true, true, true, true, true]);
+      assertExpansion([true, true, true, true]);
       gEditor.focus();
     },
     function() {
-      assertExpansion([true, true, true, true, true]);
+      assertExpansion([true, true, true, true]);
       backspaceText(gSearchBox, 1);
     },
     function() {
-      assertExpansion([true, true, true, true, true]);
+      assertExpansion([true, true, true, true]);
       EventUtils.sendKey("RETURN", gDebugger);
     },
     function() {
-      assertExpansion([true, true, true, true, true]);
+      assertExpansion([true, true, true, true]);
       EventUtils.sendKey("RETURN", gDebugger);
     },
     function() {
-      assertExpansion([true, true, true, true, true]);
+      assertExpansion([true, true, true, true]);
       gEditor.focus();
     },
     function() {
-      assertExpansion([true, true, true, true, true]);
+      assertExpansion([true, true, true, true]);
     }
   ];
 
@@ -164,12 +162,8 @@ function testVariablesAndPropertiesFiltering() {
       "The functionScope should " + (aFlags[2] ? "" : "not ") +
       "be expanded at this point (" + step + ").");
 
-    is(globalLexicalScope.expanded, aFlags[3],
+    is(globalScope.expanded, aFlags[3],
-      "The globalLexicalScope should " + (aFlags[3] ? "" : "not ") +
+      "The globalScope should " + (aFlags[3] ? "" : "not ") +
-      "be expanded at this point (" + step + ").");
-
-    is(globalScope.expanded, aFlags[4],
-      "The globalScope should " + (aFlags[4] ? "" : "not ") +
       "be expanded at this point (" + step + ").");
 
     step++;
@@ -184,8 +178,7 @@ function prepareVariablesAndProperties() {
   let localScope = gVariables.getScopeAtIndex(0);
   let withScope = gVariables.getScopeAtIndex(1);
   let functionScope = gVariables.getScopeAtIndex(2);
-  let globalLexicalScope = gVariables.getScopeAtIndex(3);
+  let globalScope = gVariables.getScopeAtIndex(3);
-  let globalScope = gVariables.getScopeAtIndex(4);
 
   is(localScope.expanded, true,
     "The localScope should be expanded.");
@@ -193,8 +186,6 @@ function prepareVariablesAndProperties() {
     "The withScope should not be expanded yet.");
   is(functionScope.expanded, false,
     "The functionScope should not be expanded yet.");
-  is(globalLexicalScope.expanded, false,
-    "The globalLexicalScope should not be expanded yet.");
   is(globalScope.expanded, false,
     "The globalScope should not be expanded yet.");
 
@@ -207,14 +198,11 @@ function prepareVariablesAndProperties() {
       "The withScope should now be expanded.");
     is(functionScope.expanded, true,
       "The functionScope should now be expanded.");
-    is(globalLexicalScope.expanded, true,
-      "The globalLexicalScope should now be expanded.");
     is(globalScope.expanded, true,
       "The globalScope should now be expanded.");
 
     withScope.collapse();
     functionScope.collapse();
-    globalLexicalScope.collapse();
     globalScope.collapse();
 
     deferred.resolve();
@@ -222,7 +210,6 @@ function prepareVariablesAndProperties() {
 
   withScope.expand();
   functionScope.expand();
-  globalLexicalScope.expand();
   globalScope.expand();
 
   return deferred.promise;

devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-05.js

@@ -43,18 +43,17 @@ function testVariablesAndPropertiesFiltering() {
   let localScope = gVariables.getScopeAtIndex(0);
   let withScope = gVariables.getScopeAtIndex(1);
   let functionScope = gVariables.getScopeAtIndex(2);
-  let globalLexicalScope = gVariables.getScopeAtIndex(3);
+  let globalScope = gVariables.getScopeAtIndex(3);
-  let globalScope = gVariables.getScopeAtIndex(4);
   let step = 0;
 
   let tests = [
     function() {
-      assertScopeExpansion([true, false, false, false, false]);
+      assertScopeExpansion([true, false, false, false]);
       typeText(gSearchBox, "*arguments");
     },
     function() {
-      assertScopeExpansion([true, true, true, true, true]);
+      assertScopeExpansion([true, true, true, true]);
-      assertVariablesCountAtLeast([0, 0, 1, 0, 0]);
+      assertVariablesCountAtLeast([0, 0, 1, 0]);
 
       is(functionScope.target.querySelectorAll(".variables-view-variable:not([unmatched]) > .title > .name")[0].getAttribute("value"),
         "arguments", "The arguments pseudoarray should be visible.");
@@ -64,8 +63,8 @@ function testVariablesAndPropertiesFiltering() {
       backspaceText(gSearchBox, 6);
     },
     function() {
-      assertScopeExpansion([true, true, true, true, true]);
+      assertScopeExpansion([true, true, true, true]);
-      assertVariablesCountAtLeast([0, 0, 1, 0, 1]);
+      assertVariablesCountAtLeast([0, 0, 1, 1]);
 
       is(functionScope.target.querySelectorAll(".variables-view-variable:not([unmatched]) > .title > .name")[0].getAttribute("value"),
         "arguments", "The arguments pseudoarray should be visible.");
@@ -80,8 +79,8 @@ function testVariablesAndPropertiesFiltering() {
       backspaceText(gSearchBox, 2);
     },
     function() {
-      assertScopeExpansion([true, true, true, true, true]);
+      assertScopeExpansion([true, true, true, true]);
-      assertVariablesCountAtLeast([0, 1, 3, 0, 1]);
+      assertVariablesCountAtLeast([0, 1, 3, 1]);
 
       is(functionScope.target.querySelectorAll(".variables-view-variable:not([unmatched]) > .title > .name")[0].getAttribute("value"),
         "aNumber", "The aNumber param should be visible.");
@@ -101,8 +100,8 @@ function testVariablesAndPropertiesFiltering() {
       backspaceText(gSearchBox, 1);
     },
     function() {
-      assertScopeExpansion([true, true, true, true, true]);
+      assertScopeExpansion([true, true, true, true]);
-      assertVariablesCountAtLeast([4, 1, 3, 0, 1]);
+      assertVariablesCountAtLeast([4, 1, 3, 1]);
 
       is(localScope.target.querySelectorAll(".variables-view-variable:not([unmatched]) > .title > .name")[0].getAttribute("value"),
         "this", "The this reference should be visible.");
@@ -154,12 +153,8 @@ function testVariablesAndPropertiesFiltering() {
       "The functionScope should " + (aFlags[2] ? "" : "not ") +
        "be expanded at this point (" + step + ").");
 
-    is(globalLexicalScope.expanded, aFlags[3],
+    is(globalScope.expanded, aFlags[3],
-      "The globalLexicalScope should " + (aFlags[3] ? "" : "not ") +
+      "The globalScope should " + (aFlags[3] ? "" : "not ") +
-       "be expanded at this point (" + step + ").");
-
-    is(globalScope.expanded, aFlags[4],
-      "The globalScope should " + (aFlags[4] ? "" : "not ") +
        "be expanded at this point (" + step + ").");
   }
 
@@ -176,12 +171,8 @@ function testVariablesAndPropertiesFiltering() {
       "There should be " + aCounts[2] +
       " variable displayed in the function scope (" + step + ").");
 
-    ok(globalLexicalScope.target.querySelectorAll(".variables-view-variable:not([unmatched])").length >= aCounts[3],
+    ok(globalScope.target.querySelectorAll(".variables-view-variable:not([unmatched])").length >= aCounts[3],
       "There should be " + aCounts[3] +
-       " variable displayed in the global scope (" + step + ").");
-
-    ok(globalScope.target.querySelectorAll(".variables-view-variable:not([unmatched])").length >= aCounts[4],
-      "There should be " + aCounts[4] +
       " variable displayed in the global scope (" + step + ").");
 
     step++;
@@ -196,8 +187,7 @@ function prepareVariablesAndProperties() {
   let localScope = gVariables.getScopeAtIndex(0);
   let withScope = gVariables.getScopeAtIndex(1);
   let functionScope = gVariables.getScopeAtIndex(2);
-  let globalLexicalScope = gVariables.getScopeAtIndex(3);
+  let globalScope = gVariables.getScopeAtIndex(3);
-  let globalScope = gVariables.getScopeAtIndex(4);
 
   is(localScope.expanded, true,
     "The localScope should be expanded.");
@@ -205,8 +195,6 @@ function prepareVariablesAndProperties() {
     "The withScope should not be expanded yet.");
   is(functionScope.expanded, false,
     "The functionScope should not be expanded yet.");
-  is(globalLexicalScope.expanded, false,
-    "The globalScope should not be expanded yet.");
   is(globalScope.expanded, false,
     "The globalScope should not be expanded yet.");
 
@@ -219,14 +207,11 @@ function prepareVariablesAndProperties() {
       "The withScope should now be expanded.");
     is(functionScope.expanded, true,
       "The functionScope should now be expanded.");
-    is(globalLexicalScope.expanded, true,
-      "The globalScope should now be expanded.");
     is(globalScope.expanded, true,
       "The globalScope should now be expanded.");
 
     withScope.collapse();
     functionScope.collapse();
-    globalLexicalScope.collapse();
     globalScope.collapse();
 
     deferred.resolve();
@@ -234,7 +219,6 @@ function prepareVariablesAndProperties() {
 
   withScope.expand();
   functionScope.expand();
-  globalLexicalScope.expand();
   globalScope.expand();
 
   return deferred.promise;

devtools/client/debugger/test/mochitest/browser_dbg_variables-view-frame-parameters-01.js

@@ -35,35 +35,27 @@ function test() {
 
 function initialChecks() {
   let scopeNodes = gDebugger.document.querySelectorAll(".variables-view-scope");
-  is(scopeNodes.length, 3,
+  is(scopeNodes.length, 2,
-    "There should be 3 scopes available.");
+    "There should be 2 scopes available.");
 
   ok(scopeNodes[0].querySelector(".name").getAttribute("value").includes("[test]"),
     "The local scope should be properly identified.");
-  ok(scopeNodes[1].querySelector(".name").getAttribute("value").includes("Block"),
+  ok(scopeNodes[1].querySelector(".name").getAttribute("value").includes("[Window]"),
-    "The global lexical scope should be properly identified.");
-  ok(scopeNodes[2].querySelector(".name").getAttribute("value").includes("[Window]"),
     "The global scope should be properly identified.");
 
   is(gVariables.getScopeAtIndex(0).target, scopeNodes[0],
     "getScopeAtIndex(0) didn't return the expected scope.");
   is(gVariables.getScopeAtIndex(1).target, scopeNodes[1],
     "getScopeAtIndex(1) didn't return the expected scope.");
-  is(gVariables.getScopeAtIndex(2).target, scopeNodes[2],
-    "getScopeAtIndex(2) didn't return the expected scope.");
 
   is(gVariables.getItemForNode(scopeNodes[0]).target, scopeNodes[0],
     "getItemForNode([0]) didn't return the expected scope.");
   is(gVariables.getItemForNode(scopeNodes[1]).target, scopeNodes[1],
     "getItemForNode([1]) didn't return the expected scope.");
-  is(gVariables.getItemForNode(scopeNodes[2]).target, scopeNodes[2],
-    "getItemForNode([2]) didn't return the expected scope.");
 
   is(gVariables.getItemForNode(scopeNodes[0]).expanded, true,
     "The local scope should be expanded by default.");
   is(gVariables.getItemForNode(scopeNodes[1]).expanded, false,
-    "The global lexical scope should not be collapsed by default.");
-  is(gVariables.getItemForNode(scopeNodes[2]).expanded, false,
     "The global scope should not be collapsed by default.");
 }
 

devtools/client/debugger/test/mochitest/browser_dbg_variables-view-frame-parameters-03.js

@@ -38,7 +38,7 @@ function test() {
 function expandGlobalScope() {
   let deferred = promise.defer();
 
-  let globalScope = gVariables.getScopeAtIndex(2);
+  let globalScope = gVariables.getScopeAtIndex(1);
   is(globalScope.expanded, false,
     "The global scope should not be expanded by default.");
 
@@ -52,7 +52,7 @@ function expandGlobalScope() {
 }
 
 function testGlobalScope() {
-  let globalScope = gVariables.getScopeAtIndex(2);
+  let globalScope = gVariables.getScopeAtIndex(1);
   is(globalScope.expanded, true,
     "The global scope should now be expanded.");
 
@@ -92,7 +92,7 @@ function testGlobalScope() {
 function expandWindowVariable() {
   let deferred = promise.defer();
 
-  let windowVar = gVariables.getScopeAtIndex(2).get("window");
+  let windowVar = gVariables.getScopeAtIndex(1).get("window");
   is(windowVar.expanded, false,
     "The window variable should not be expanded by default.");
 
@@ -106,7 +106,7 @@ function expandWindowVariable() {
 }
 
 function testWindowVariable() {
-  let windowVar = gVariables.getScopeAtIndex(2).get("window");
+  let windowVar = gVariables.getScopeAtIndex(1).get("window");
   is(windowVar.expanded, true,
     "The window variable should now be expanded.");
 

devtools/client/debugger/test/mochitest/browser_dbg_variables-view-override-01.js

@@ -21,13 +21,11 @@ function test() {
     let firstScope = variables.getScopeAtIndex(0);
     let secondScope = variables.getScopeAtIndex(1);
     let thirdScope = variables.getScopeAtIndex(2);
-    let globalLexicalScope = variables.getScopeAtIndex(3);
+    let globalScope = variables.getScopeAtIndex(3);
-    let globalScope = variables.getScopeAtIndex(4);
 
     ok(firstScope, "The first scope is available.");
     ok(secondScope, "The second scope is available.");
     ok(thirdScope, "The third scope is available.");
-    ok(globalLexicalScope, "The global lexical scope is available.");
     ok(globalScope, "The global scope is available.");
 
     is(firstScope.name, "Function scope [secondNest]",
@@ -36,8 +34,6 @@ function test() {
       "The second scope's name is correct.");
     is(thirdScope.name, "Function scope [test]",
       "The third scope's name is correct.");
-    is(globalLexicalScope.name, "Block scope",
-      "The global lexical scope's name is correct.");
     is(globalScope.name, "Global scope [Window]",
       "The global scope's name is correct.");
 
@@ -47,8 +43,6 @@ function test() {
       "The second scope's expansion state is correct.");
     is(thirdScope.expanded, false,
       "The third scope's expansion state is correct.");
-    is(globalLexicalScope.expanded, false,
-      "The global lexical scope's expansion state is correct.");
     is(globalScope.expanded, false,
       "The global scope's expansion state is correct.");
 
@@ -58,8 +52,6 @@ function test() {
       "The second scope should have no variables available yet.");
     is(thirdScope._store.size, 0,
       "The third scope should have no variables available yet.");
-    is(globalLexicalScope._store.size, 0,
-      "The global scope should have no variables available yet.");
     is(globalScope._store.size, 0,
       "The global scope should have no variables available yet.");
 
@@ -108,7 +100,6 @@ function test() {
     fetched = waitForDebuggerEvents(panel, events.FETCHED_VARIABLES);
     secondScope.expand();
     thirdScope.expand();
-    globalLexicalScope.expand();
     globalScope.expand();
     yield fetched;
 

devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-16.js

@@ -42,7 +42,7 @@ function test() {
     }
 
     function expandGlobalScope() {
-      let globalScope = variables.getScopeAtIndex(2);
+      let globalScope = variables.getScopeAtIndex(1);
       is(globalScope.expanded, false,
         "The globalScope should not be expanded yet.");
 

devtools/client/debugger/test/mochitest/browser_dbg_variables-view-reexpand-01.js

@@ -74,8 +74,7 @@ function testVariablesExpand() {
   let localScope = gVariables.getScopeAtIndex(0);
   let withScope = gVariables.getScopeAtIndex(1);
   let functionScope = gVariables.getScopeAtIndex(2);
-  let globalLexicalScope = gVariables.getScopeAtIndex(3);
+  let globalScope = gVariables.getScopeAtIndex(3);
-  let globalScope = gVariables.getScopeAtIndex(4);
 
   let thisVar = localScope.get("this");
   let windowVar = thisVar.get("window");
@@ -86,8 +85,6 @@ function testVariablesExpand() {
     "The withScope arrow should still be expanded.");
   is(functionScope.target.querySelector(".arrow").hasAttribute("open"), true,
     "The functionScope arrow should still be expanded.");
-  is(globalLexicalScope.target.querySelector(".arrow").hasAttribute("open"), true,
-    "The globalLexicalScope arrow should still be expanded.");
   is(globalScope.target.querySelector(".arrow").hasAttribute("open"), true,
     "The globalScope arrow should still be expanded.");
   is(thisVar.target.querySelector(".arrow").hasAttribute("open"), true,
@@ -101,8 +98,6 @@ function testVariablesExpand() {
     "The withScope enumerables should still be expanded.");
   is(functionScope.target.querySelector(".variables-view-element-details").hasAttribute("open"), true,
     "The functionScope enumerables should still be expanded.");
-  is(globalLexicalScope.target.querySelector(".variables-view-element-details").hasAttribute("open"), true,
-    "The globalLexicalScope enumerables should still be expanded.");
   is(globalScope.target.querySelector(".variables-view-element-details").hasAttribute("open"), true,
     "The globalScope enumerables should still be expanded.");
   is(thisVar.target.querySelector(".variables-view-element-details").hasAttribute("open"), true,
@@ -116,8 +111,6 @@ function testVariablesExpand() {
     "The withScope expanded getter should return true.");
   is(functionScope.expanded, true,
     "The functionScope expanded getter should return true.");
-  is(globalLexicalScope.expanded, true,
-    "The globalScope expanded getter should return true.");
   is(globalScope.expanded, true,
     "The globalScope expanded getter should return true.");
   is(thisVar.expanded, true,
@@ -132,8 +125,7 @@ function prepareVariablesAndProperties() {
   let localScope = gVariables.getScopeAtIndex(0);
   let withScope = gVariables.getScopeAtIndex(1);
   let functionScope = gVariables.getScopeAtIndex(2);
-  let globalLexicalScope = gVariables.getScopeAtIndex(3);
+  let globalScope = gVariables.getScopeAtIndex(3);
-  let globalScope = gVariables.getScopeAtIndex(4);
 
   is(localScope.expanded, true,
     "The localScope should be expanded.");
@@ -141,8 +133,6 @@ function prepareVariablesAndProperties() {
     "The withScope should not be expanded yet.");
   is(functionScope.expanded, false,
     "The functionScope should not be expanded yet.");
-  is(globalLexicalScope.expanded, false,
-    "The globalLexicalScope should not be expanded yet.");
   is(globalScope.expanded, false,
     "The globalScope should not be expanded yet.");
 
@@ -155,8 +145,6 @@ function prepareVariablesAndProperties() {
       "The withScope should now be expanded.");
     is(functionScope.expanded, true,
       "The functionScope should now be expanded.");
-    is(globalLexicalScope.expanded, true,
-      "The globalLexicalScope should now be expanded.");
     is(globalScope.expanded, true,
       "The globalScope should now be expanded.");
 
@@ -198,7 +186,6 @@ function prepareVariablesAndProperties() {
 
   withScope.expand();
   functionScope.expand();
-  globalLexicalScope.expand();
   globalScope.expand();
 
   return deferred.promise;

devtools/client/debugger/test/mochitest/browser_dbg_variables-view-reexpand-02.js

@@ -75,8 +75,7 @@ function testVariablesExpand() {
   let localScope = gVariables.getScopeAtIndex(0);
   let withScope = gVariables.getScopeAtIndex(1);
   let functionScope = gVariables.getScopeAtIndex(2);
-  let globalLexicalScope = gVariables.getScopeAtIndex(3);
+  let globalScope = gVariables.getScopeAtIndex(3);
-  let globalScope = gVariables.getScopeAtIndex(4);
 
   let thisVar = localScope.get("this");
   let windowVar = thisVar.get("window");
@@ -89,8 +88,6 @@ function testVariablesExpand() {
     "The withScope arrow should still be expanded.");
   is(functionScope.target.querySelector(".arrow").hasAttribute("open"), true,
     "The functionScope arrow should still be expanded.");
-  is(globalLexicalScope.target.querySelector(".arrow").hasAttribute("open"), true,
-    "The globalLexicalScope arrow should still be expanded.");
   is(globalScope.target.querySelector(".arrow").hasAttribute("open"), true,
     "The globalScope arrow should still be expanded.");
   is(thisVar.target.querySelector(".arrow").hasAttribute("open"), true,
@@ -108,8 +105,6 @@ function testVariablesExpand() {
     "The withScope enumerables should still be expanded.");
   is(functionScope.target.querySelector(".variables-view-element-details").hasAttribute("open"), true,
     "The functionScope enumerables should still be expanded.");
-  is(globalLexicalScope.target.querySelector(".variables-view-element-details").hasAttribute("open"), true,
-    "The globalLexicalScope enumerables should still be expanded.");
   is(globalScope.target.querySelector(".variables-view-element-details").hasAttribute("open"), true,
     "The globalScope enumerables should still be expanded.");
   is(thisVar.target.querySelector(".variables-view-element-details").hasAttribute("open"), true,
@@ -127,8 +122,6 @@ function testVariablesExpand() {
     "The withScope expanded getter should return true.");
   is(functionScope.expanded, true,
     "The functionScope expanded getter should return true.");
-  is(globalLexicalScope.expanded, true,
-    "The globalLexicalScope expanded getter should return true.");
   is(globalScope.expanded, true,
     "The globalScope expanded getter should return true.");
   is(thisVar.expanded, true,
@@ -147,8 +140,7 @@ function prepareVariablesAndProperties() {
   let localScope = gVariables.getScopeAtIndex(0);
   let withScope = gVariables.getScopeAtIndex(1);
   let functionScope = gVariables.getScopeAtIndex(2);
-  let globalLexicalScope = gVariables.getScopeAtIndex(3);
+  let globalScope = gVariables.getScopeAtIndex(3);
-  let globalScope = gVariables.getScopeAtIndex(4);
 
   is(localScope.expanded, true,
     "The localScope should be expanded.");
@@ -156,8 +148,6 @@ function prepareVariablesAndProperties() {
     "The withScope should not be expanded yet.");
   is(functionScope.expanded, false,
     "The functionScope should not be expanded yet.");
-  is(globalLexicalScope.expanded, false,
-    "The globalLexicalScope should not be expanded yet.");
   is(globalScope.expanded, false,
     "The globalScope should not be expanded yet.");
 
@@ -170,8 +160,6 @@ function prepareVariablesAndProperties() {
       "The withScope should now be expanded.");
     is(functionScope.expanded, true,
       "The functionScope should now be expanded.");
-    is(globalLexicalScope.expanded, true,
-      "The globalLexicalScope should now be expanded.");
     is(globalScope.expanded, true,
       "The globalScope should now be expanded.");
 
@@ -213,7 +201,6 @@ function prepareVariablesAndProperties() {
 
   withScope.expand();
   functionScope.expand();
-  globalLexicalScope.expand();
   globalScope.expand();
 
   return deferred.promise;

devtools/client/debugger/test/mochitest/browser_dbg_variables-view-webidl.js

@@ -36,7 +36,7 @@ function test() {
 function expandGlobalScope() {
   let deferred = promise.defer();
 
-  let globalScope = gVariables.getScopeAtIndex(2);
+  let globalScope = gVariables.getScopeAtIndex(1);
   is(globalScope.expanded, false,
     "The global scope should not be expanded by default.");
 
@@ -51,7 +51,7 @@ function expandGlobalScope() {
 
 function performTest() {
   let deferred = promise.defer();
-  let globalScope = gVariables.getScopeAtIndex(2);
+  let globalScope = gVariables.getScopeAtIndex(1);
 
   let buttonVar = globalScope.get("button");
   let buttonAsProtoVar = globalScope.get("buttonAsProto");

devtools/client/debugger/test/mochitest/doc_function-search.html

@@ -17,10 +17,10 @@
 
     <script type="text/javascript;version=1.8">
       function inline() {}
-      var arrow = () => {}
+      let arrow = () => {}
 
-      var foo = bar => {}
+      let foo = bar => {}
-      var foo2 = bar2 = baz2 => 42;
+      let foo2 = bar2 = baz2 => 42;
 
       setTimeout((foo, bar, baz) => {});
       setTimeout((foo, bar, baz) => 42);

devtools/client/debugger/utils.js

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-var XULUtils = {
+const XULUtils = {
   /**
    * Create <command> elements within `commandset` with event handlers
    * bound to the `command` event
@@ -35,7 +35,7 @@ const CHARACTER_LIMIT = 250; // line character limit
 /**
  * Utility functions for handling sources.
  */
-var SourceUtils = {
+const SourceUtils = {
   _labelsCache: new Map(), // Can't use WeakMaps because keys are strings.
   _groupsCache: new Map(),
   _minifiedCache: new WeakMap(),

devtools/client/inspector/inspector-panel.js

@@ -988,13 +988,13 @@ InspectorPanel.prototype = {
       let panel = this._toolbox.getPanel("webconsole");
       let jsterm = panel.hud.jsterm;
 
-      let evalString = `{ let i = 0;
+      let evalString = `let i = 0;
         while (window.hasOwnProperty("temp" + i) && i < 1000) {
           i++;
         }
         window["temp" + i] = $0;
         "temp" + i;
-      }`;
+      `;
 
       let options = {
         selectedNodeActor: this.selection.nodeFront.actorID,

devtools/client/markupview/test/actor_events_form.js

@@ -14,7 +14,7 @@ const {ActorClass, Actor, FrontClass, Front, method} =
 const {Cu} = require("chrome");
 const {NodeActor} = require("devtools/server/actors/inspector");
 
-var EventsFormActor = ActorClass({
+const EventsFormActor = ActorClass({
   typeName: "eventsFormActor",
 
   initialize: function() {
@@ -44,7 +44,7 @@ var EventsFormActor = ActorClass({
   }
 });
 
-var EventsFormFront = FrontClass(EventsFormActor, {
+const EventsFormFront = FrontClass(EventsFormActor, {
   initialize: function(client, form) {
     Front.prototype.initialize.apply(this, arguments);
 

devtools/client/netmonitor/netmonitor-controller.js

@@ -125,10 +125,6 @@ const {Tooltip} = require("devtools/client/shared/widgets/Tooltip");
 const {ToolSidebar} = require("devtools/client/framework/sidebar");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 
-XPCOMUtils.defineConstant(this, "EVENTS", EVENTS);
-XPCOMUtils.defineConstant(this, "ACTIVITY_TYPE", ACTIVITY_TYPE);
-XPCOMUtils.defineConstant(this, "Editor", Editor);
-
 XPCOMUtils.defineLazyModuleGetter(this, "Chart",
   "resource:///modules/devtools/client/shared/widgets/Chart.jsm");
 

devtools/client/performance/performance-controller.js

@@ -11,11 +11,6 @@ const { Heritage, ViewHelpers, WidgetMethods } = require("resource:///modules/de
 
 // Events emitted by various objects in the panel.
 const EVENTS = require("devtools/client/performance/events");
-Object.defineProperty(this, "EVENTS", {
-  value: EVENTS,
-  enumerable: true,
-  writable: false
-});
 
 loader.lazyRequireGetter(this, "Services");
 loader.lazyRequireGetter(this, "promise");

devtools/client/performance/test/head.js

@@ -47,9 +47,6 @@ const FLATTEN_PREF = "devtools.performance.ui.flatten-tree-recursion";
 const JIT_PREF = "devtools.performance.ui.enable-jit-optimizations";
 const EXPERIMENTAL_PREF = "devtools.performance.ui.experimental";
 
-// Keep in sync with FRAMERATE_GRAPH_HIGH_RES_INTERVAL in views/overview.js
-const FRAMERATE_GRAPH_HIGH_RES_INTERVAL = 16; // ms
-
 // All tests are asynchronous.
 waitForExplicitFinish();
 
@@ -426,7 +423,7 @@ function* stopRecording(panel, options = {
   // incremental rendering and less likely to be from another rendering that was selected
   while (!overviewRendered && options.waitForOverview) {
     let [_, res] = yield onceSpread(win.OverviewView, win.EVENTS.OVERVIEW_RENDERED);
-    if (res === FRAMERATE_GRAPH_HIGH_RES_INTERVAL) {
+    if (res === win.FRAMERATE_GRAPH_HIGH_RES_INTERVAL) {
       overviewRendered = true;
     }
   }

devtools/client/performance/views/overview.js

@@ -19,7 +19,7 @@ const GRAPH_REQUIREMENTS = {
   memory: {
     features: ["withMemory"]
   },
-};
+}
 
 /**
  * View handler for the overview panel's time view, displaying

devtools/client/responsivedesign/test/head.js

@@ -3,7 +3,7 @@
 
 "use strict";
 
-var {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
+var {require} = Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm", {});
 var {TargetFactory} = require("devtools/client/framework/target");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 var promise = require("promise");

devtools/client/scratchpad/scratchpad.js

@@ -63,13 +63,6 @@ Cu.import("resource://gre/modules/osfile.jsm");
 Cu.import("resource:///modules/devtools/client/shared/widgets/ViewHelpers.jsm");
 Cu.import("resource://gre/modules/reflect.jsm");
 
-XPCOMUtils.defineConstant(this, "SCRATCHPAD_CONTEXT_CONTENT", SCRATCHPAD_CONTEXT_CONTENT);
-XPCOMUtils.defineConstant(this, "SCRATCHPAD_CONTEXT_BROWSER", SCRATCHPAD_CONTEXT_BROWSER);
-XPCOMUtils.defineConstant(this, "BUTTON_POSITION_SAVE", BUTTON_POSITION_SAVE);
-XPCOMUtils.defineConstant(this, "BUTTON_POSITION_CANCEL", BUTTON_POSITION_CANCEL);
-XPCOMUtils.defineConstant(this, "BUTTON_POSITION_DONT_SAVE", BUTTON_POSITION_DONT_SAVE);
-XPCOMUtils.defineConstant(this, "BUTTON_POSITION_REVERT", BUTTON_POSITION_REVERT);
-
 XPCOMUtils.defineLazyModuleGetter(this, "VariablesView",
   "resource:///modules/devtools/client/shared/widgets/VariablesView.jsm");
 

devtools/client/scratchpad/test/browser_scratchpad_files.js

@@ -2,6 +2,10 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+var tempScope = {};
+Cu.import("resource://gre/modules/NetUtil.jsm", tempScope);
+var NetUtil = tempScope.NetUtil;
+
 // Reference to the Scratchpad object.
 var gScratchpad;
 

devtools/client/scratchpad/test/browser_scratchpad_modeline.js

@@ -3,6 +3,13 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 /* Bug 644413 */
 
+var tempScope = {};
+Cu.import("resource://gre/modules/NetUtil.jsm", tempScope);
+Cu.import("resource://gre/modules/FileUtils.jsm", tempScope);
+var NetUtil = tempScope.NetUtil;
+var FileUtils = tempScope.FileUtils;
+
+
 var gScratchpad; // Reference to the Scratchpad object.
 var gFile; // Reference to the temporary nsIFile we will work with.
 var DEVTOOLS_CHROME_ENABLED = "devtools.chrome.enabled";

devtools/client/scratchpad/test/browser_scratchpad_recent_files.js

@@ -3,6 +3,12 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 /* Bug 651942 */
 
+var tempScope = {};
+Cu.import("resource://gre/modules/NetUtil.jsm", tempScope);
+Cu.import("resource://gre/modules/FileUtils.jsm", tempScope);
+var NetUtil = tempScope.NetUtil;
+var FileUtils = tempScope.FileUtils;
+
 // Reference to the Scratchpad object.
 var gScratchpad;
 

devtools/client/scratchpad/test/browser_scratchpad_reset_undo.js

@@ -3,6 +3,12 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 /* Bug 684546 */
 
+var tempScope = {};
+Cu.import("resource://gre/modules/NetUtil.jsm", tempScope);
+Cu.import("resource://gre/modules/FileUtils.jsm", tempScope);
+var NetUtil = tempScope.NetUtil;
+var FileUtils = tempScope.FileUtils;
+
 // Reference to the Scratchpad chrome window object.
 var gScratchpadWindow;
 

devtools/client/scratchpad/test/browser_scratchpad_revert_to_saved.js

@@ -3,6 +3,12 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 /* Bug 751744 */
 
+var tempScope = {};
+Cu.import("resource://gre/modules/NetUtil.jsm", tempScope);
+Cu.import("resource://gre/modules/FileUtils.jsm", tempScope);
+var NetUtil = tempScope.NetUtil;
+var FileUtils = tempScope.FileUtils;
+
 // Reference to the Scratchpad object.
 var gScratchpad;
 

devtools/client/shadereditor/shadereditor.js

@@ -38,7 +38,6 @@ const EVENTS = {
   // When the editor's error markers are all removed
   EDITOR_ERROR_MARKERS_REMOVED: "ShaderEditor:EditorCleaned"
 };
-XPCOMUtils.defineConstant(this, "EVENTS", EVENTS);
 
 const STRINGS_URI = "chrome://browser/locale/devtools/shadereditor.properties"
 const HIGHLIGHT_TINT = [1, 0, 0.25, 1]; // rgba

devtools/client/shared/test/test-actor.js

@@ -38,7 +38,7 @@ function getHighlighterCanvasFrameHelper(conn, actorID) {
   }
 }
 
-var TestActor = exports.TestActor = protocol.ActorClass({
+const TestActor = exports.TestActor = protocol.ActorClass({
   typeName: "testActor",
 
   initialize: function(conn, tabActor, options) {
@@ -525,7 +525,7 @@ var TestActor = exports.TestActor = protocol.ActorClass({
   }),
 });
 
-var TestActorFront = exports.TestActorFront = protocol.FrontClass(TestActor, {
+const TestActorFront = exports.TestActorFront = protocol.FrontClass(TestActor, {
   initialize: function(client, { testActor }, toolbox) {
     protocol.Front.prototype.initialize.call(this, client, { actor: testActor });
     this.manage(this);

devtools/client/shared/widgets/TableWidget.js

@@ -20,11 +20,6 @@ const EVENTS = {
   HEADER_CONTEXT_MENU: "header-context-menu",
   ROW_CONTEXT_MENU: "row-context-menu"
 };
-Object.defineProperty(this, "EVENTS", {
-  value: EVENTS,
-  enumerable: true,
-  writable: false
-});
 
 // Maximum number of character visible in any cell in the table. This is to avoid
 // making the cell take up all the space in a row.

devtools/client/webaudioeditor/includes.js

@@ -74,7 +74,6 @@ const EVENTS = {
   // Called when the inspector splitter is moved and resized.
   UI_INSPECTOR_RESIZE: "WebAudioEditor:UIInspectorResize"
 };
-XPCOMUtils.defineConstant(this, "EVENTS", EVENTS);
 
 /**
  * The current target and the Web Audio Editor front, set by this tool's host.

devtools/client/webaudioeditor/views/context.js

@@ -21,11 +21,6 @@ const MARKER_STYLING = {
   light: "#AAA",
   dark: "#CED3D9"
 };
-Object.defineProperty(this, "MARKER_STYLING", {
-  value: MARKER_STYLING,
-  enumerable: true,
-  writable: false
-});
 
 const GRAPH_DEBOUNCE_TIMER = 100;
 

devtools/client/webconsole/test/browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js

@@ -28,11 +28,7 @@ var test = asyncTest(function*() {
   let { jsterm } = yield openConsole();
   let popup = jsterm.autocompletePopup;
 
-  yield jsterm.execute("var testObject = {$$aaab: '', $$aaac: ''}");
+  yield jsterm.execute("let testObject = {$$aaab: '', $$aaac: ''}");
-
-  // FIXMEshu: global lexicals can't be autocompleted without extra platform
-  // support. See bug 1207868.
-  //yield jsterm.execute("let testObject = {$$aaab: '', $$aaac: ''}");
 
   // Should work with bug 967468.
   yield autocomplete("Object.__d");

devtools/client/webide/content/webide.js

@@ -38,16 +38,6 @@ const MIN_ZOOM = 0.6;
 
 const MS_PER_DAY = 86400000;
 
-[["AppManager", AppManager],
- ["AppProjects", AppProjects],
- ["Connection", Connection]].forEach(([key, value]) => {
-   Object.defineProperty(this, key, {
-     value: value,
-     enumerable: true,
-     writable: false
-   });
- });
-
 // Download remote resources early
 getJSON("devtools.webide.addonsURL", true);
 getJSON("devtools.webide.templatesURL", true);

devtools/server/tests/mochitest/hello-actor.js

@@ -3,7 +3,7 @@
 
 const protocol = require("devtools/server/protocol");
 
-var HelloActor = protocol.ActorClass({
+const HelloActor = protocol.ActorClass({
   typeName: "helloActor",
 
   initialize: function() {

devtools/server/tests/mochitest/test_registerActor.html

@@ -67,7 +67,7 @@ window.onload = function() {
 }
 
 function checkActorState(helloActor, callback) {
-getCount(helloActor, response => {
+  getCount(helloActor, response => {
     ok(!response.error, "No error");
     is(response.count, 1, "The counter must be valid");
 

devtools/server/tests/unit/hello-actor.js

@@ -3,7 +3,7 @@
 
 const protocol = require("devtools/server/protocol");
 
-var HelloActor = protocol.ActorClass({
+const HelloActor = protocol.ActorClass({
   typeName: "helloActor",
 
   hello: protocol.method(function () {

devtools/server/tests/unit/test_framebindings-02.js

@@ -36,8 +36,7 @@ function test_pause_frame()
     do_check_eq(vars.stopMe.value.class, "Function");
     do_check_true(!!vars.stopMe.value.actor);
 
-    // Skip both the eval lexical scope and the global lexical scope.
+    parentEnv = parentEnv.parent.parent;
-    parentEnv = parentEnv.parent.parent.parent;
     do_check_neq(parentEnv, undefined);
     let objClient = gThreadClient.pauseGrip(parentEnv.object);
     objClient.getPrototypeAndProperties(function(aResponse) {

devtools/server/tests/unit/test_framebindings-05.js

@@ -36,8 +36,7 @@ function test_pause_frame()
       do_check_eq(aResponse.ownProperties.cos.value.class, "Function");
       do_check_true(!!aResponse.ownProperties.cos.value.actor);
 
-      // Skip both the eval lexical scope and the global lexical scope.
+      let parentEnv = env.parent.parent;
-      let parentEnv = env.parent.parent.parent;
       do_check_neq(parentEnv, undefined);
 
       let parentClient = gThreadClient.pauseGrip(parentEnv.object);

devtools/shared/apps/Devices.jsm

@@ -44,10 +44,5 @@ const Devices = {
     return this._devices[name];
   }
 };
-Object.defineProperty(this, "Devices", {
-  value: Devices,
-  enumerable: true,
-  writable: false
-});
 
 EventEmitter.decorate(Devices);

devtools/shared/webconsole/test/test_commands_registration.html

@@ -18,6 +18,7 @@ SimpleTest.waitForExplicitFinish();
 let gState;
 let tests;
 
+let {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
 let {WebConsoleCommands} = require("devtools/shared/webconsole/utils");
 
 function evaluateJS(input) {

devtools/shared/webconsole/test/test_jsterm.html

@@ -16,6 +16,7 @@ SimpleTest.waitForExplicitFinish();
 
 let gState;
 
+let {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
 let {MAX_AUTOCOMPLETE_ATTEMPTS,MAX_AUTOCOMPLETIONS} = require("devtools/shared/webconsole/utils");
 
 // This test runs all of its assertions twice - once with

devtools/shared/worker-loader.js

@@ -429,7 +429,7 @@ var {
     return {
       Debugger,
       createSandbox,
-      dump: this.dump,
+      dump,
       rpc,
       loadSubScript,
       reportError,

dom/base/test/test_anonymousContent_append_after_reflow.html

@@ -30,7 +30,7 @@
   forceFlush = document.documentElement.offsetHeight;
 
   info("Checking that the anonymous content can be retrieved still");
-  style = anonymousContent.getAttributeForElement("test-element", "style");
+  let style = anonymousContent.getAttributeForElement("test-element", "style");
   is(style, "color:green;", "The anonymous content still exists after reflow");
 
   info("Removing the anonymous content");

dom/base/test/test_anonymousContent_style_csp.html

@@ -19,7 +19,7 @@
   let style = anonymousContent.setAttributeForElement("test-element",
                                                       "style", "color:green;");
 
-  style = anonymousContent.getAttributeForElement("test-element", "style");
+  let style = anonymousContent.getAttributeForElement("test-element", "style");
   is(style, "color:green;", "The anonymous content exists with CSP");
 
   chromeDocument.removeAnonymousContent(anonymousContent);

dom/devicestorage/test/test_fs_remove.html

@@ -161,7 +161,7 @@ function testNextRemove() {
 
 ok(navigator.getDeviceStorage, "Should have getDeviceStorage.");
 
-gStorage = navigator.getDeviceStorage("pictures");
+let gStorage = navigator.getDeviceStorage("pictures");
 ok(gStorage, "Should have gotten a storage.");
 
 // Test "removeDeep" first.

dom/html/test/test_checked.html

@@ -29,11 +29,11 @@ and
 <script class="testbody" type="text/javascript; version=1.7">
 
 /** Test for Bug 418756 and 617528 **/
-var group1;
+let group1;
-var group2;
+let group2;
-var group3;
+let group3;
 
-var tags = ["input", "menuitem"];
+let tags = ["input", "menuitem"];
 for each (let tag in tags) {
 
 function bounce(node) {
@@ -43,7 +43,7 @@ function bounce(node) {
   p.insertBefore(node, n);
 }
 
-var createdNodes = [];
+let createdNodes = [];
 
 function cleanup() {
   for each (let node in createdNodes) {
@@ -55,12 +55,12 @@ function cleanup() {
   createdNodes = [];
 }
 
-var typeMapper = {
+let typeMapper = {
  'c': 'checkbox',
  'r': 'radio'
 };
 
-var id = 0;
+let id = 0;
 
 // type can be 'c' for 'checkbox' and 'r' for 'radio'
 function createNode(type, name, checked) {
@@ -75,7 +75,7 @@ function createNode(type, name, checked) {
   return node;
 }
 
-var types = ['c', 'r'];
+let types = ['c', 'r'];
 
 // First make sure that setting .checked makes .defaultChecked changes no
 // longer affect .checked.

dom/ipc/preload.js

@@ -7,9 +7,9 @@
 // This script is run when the preallocated process starts.  It is injected as
 // a frame script.
 
-var BrowserElementIsPreloaded = true;
+const BrowserElementIsPreloaded = true;
 
-var DoPreloadPostfork = function(aCallback) {
+const DoPreloadPostfork = function(aCallback) {
   Services.obs.addObserver({
     _callback: aCallback,
 

dom/mobilemessage/gonk/WspPduHelper.jsm

@@ -7,7 +7,6 @@
 const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
 Cu.importGlobalProperties(['Blob']);
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/wap_consts.js", this);
 
 var DEBUG; // set to true to see debug messages
@@ -21,21 +20,10 @@ const HT = 9;
 const DQUOTE = 34;
 const DEL = 127;
 
-XPCOMUtils.defineConstant(this, "NUL", NUL);
-XPCOMUtils.defineConstant(this, "CR", CR);
-XPCOMUtils.defineConstant(this, "LF", LF);
-XPCOMUtils.defineConstant(this, "SP", SP);
-XPCOMUtils.defineConstant(this, "HT", HT);
-XPCOMUtils.defineConstant(this, "DQUOTE", DQUOTE);
-XPCOMUtils.defineConstant(this, "DEL", DEL);
-
 // Special ASCII character ranges
 const CTLS = 32;
 const ASCIIS = 128;
 
-XPCOMUtils.defineConstant(this, "CTLS", CTLS);
-XPCOMUtils.defineConstant(this, "ASCIIS", ASCIIS);
-
 /**
  * Error class for generic encoding/decoding failures.
  */

dom/plugins/test/unit/test_bug455213.js

@@ -11,6 +11,8 @@ if ("@mozilla.org/windows-registry-key;1" in Components.classes)
   DELIM = "|";
 
 var gProfD = do_get_profile_startup();
+var gDirSvc = Cc["@mozilla.org/file/directory_service;1"].
+             getService(Ci.nsIProperties);
 
 // Writes out some plugin registry to the profile
 function write_registry(version, info) {

dom/plugins/test/unit/test_bug813245.js

@@ -11,6 +11,8 @@ if ("@mozilla.org/windows-registry-key;1" in Components.classes)
   DELIM = "|";
 
 var gProfD = do_get_profile_startup();
+var gDirSvc = Cc["@mozilla.org/file/directory_service;1"].
+             getService(Ci.nsIProperties);
 
 // Writes out some plugin registry to the profile
 function write_registry(version, info) {

dom/plugins/test/unit/test_nice_plugin_name.js

@@ -56,6 +56,9 @@ function createAppInfo(id, name, version, platformVersion) {
                             XULAPPINFO_CONTRACTID, XULAppInfoFactory);
 }
 
+var gDirSvc = Cc["@mozilla.org/file/directory_service;1"]
+                .getService(Ci.nsIProperties);
+
 var gPluginHost = null;
 
 function test_expected_permission_string(aPermString) {

dom/plugins/test/unit/test_persist_in_prefs.js

@@ -11,6 +11,8 @@ if ("@mozilla.org/windows-registry-key;1" in Components.classes)
   DELIM = "|";
 
 var gProfD = do_get_profile_startup();
+var gDirSvc = Cc["@mozilla.org/file/directory_service;1"].
+             getService(Ci.nsIProperties);
 
 // Writes out some plugin registry to the profile
 function write_registry(version, info) {

dom/telephony/gonk/TelephonyService.js

@@ -60,12 +60,6 @@ const MMI_PROCEDURE_INTERROGATION = "*#";
 const MMI_PROCEDURE_REGISTRATION = "**";
 const MMI_PROCEDURE_ERASURE = "##";
 
-XPCOMUtils.defineConstant(this, "MMI_PROCEDURE_ACTIVATION", MMI_PROCEDURE_ACTIVATION);
-XPCOMUtils.defineConstant(this, "MMI_PROCEDURE_DEACTIVATION", MMI_PROCEDURE_DEACTIVATION);
-XPCOMUtils.defineConstant(this, "MMI_PROCEDURE_INTERROGATION", MMI_PROCEDURE_INTERROGATION);
-XPCOMUtils.defineConstant(this, "MMI_PROCEDURE_REGISTRATION", MMI_PROCEDURE_REGISTRATION);
-XPCOMUtils.defineConstant(this, "MMI_PROCEDURE_ERASURE", MMI_PROCEDURE_ERASURE);
-
 // MMI call forwarding service codes as defined in TS.22.030 Annex B
 const MMI_SC_CFU = "21";
 const MMI_SC_CF_BUSY = "67";

dom/tests/mochitest/chrome/489127.html

@@ -6,7 +6,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 <script type="application/javascript;version=1.8">
 
-  var SimpleTest = window.opener.SimpleTest;
+  let SimpleTest = window.opener.SimpleTest;
   function ok() { window.opener.ok.apply(window.opener, arguments); }
   function done() { window.opener.done.apply(window.opener, arguments); }
   let e = {};

dom/tests/mochitest/chrome/queryCaretRectUnix.html

@@ -36,8 +36,8 @@
 </style>
 
 <script type="application/javascript;version=1.8">
-  var SimpleTest = window.opener.SimpleTest;
+  let SimpleTest = window.opener.SimpleTest;
-  var Ci = Components.interfaces;
+  let Ci = Components.interfaces;
 
   function ok() { window.opener.ok.apply(window.opener, arguments); }
   function done() { window.opener.done.apply(window.opener, arguments); }

dom/tests/mochitest/chrome/queryCaretRectWin.html

@@ -45,8 +45,8 @@
 </style>
 
 <script type="application/javascript;version=1.8">
-  var SimpleTest = window.opener.SimpleTest;
+  let SimpleTest = window.opener.SimpleTest;
-  var Ci = Components.interfaces;
+  let Ci = Components.interfaces;
 
   function ok() { window.opener.ok.apply(window.opener, arguments); }
   function done() { window.opener.done.apply(window.opener, arguments); }

dom/tests/mochitest/chrome/selectAtPoint.html

@@ -6,8 +6,8 @@
 <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 
 <script type="application/javascript;version=1.8">
-  var SimpleTest = window.opener.SimpleTest;
+  let SimpleTest = window.opener.SimpleTest;
-  var Ci = Components.interfaces;
+  let Ci = Components.interfaces;
 
   function ok() { window.opener.ok.apply(window.opener, arguments); }
   function done() { window.opener.done.apply(window.opener, arguments); }

js/xpconnect/loader/XPCOMUtils.jsm

@@ -367,17 +367,6 @@ this.XPCOMUtils = {
       QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory])
     };
   },
-
-  /**
-   * Defines a non-writable property on an object.
-   */
-  defineConstant: function XPCOMUtils__defineConstant(aObj, aName, aValue) {
-    Object.defineProperty(aObj, aName, {
-      value: aValue,
-      enumerable: true,
-      writable: false
-    });
-  },
 };
 
 /**

js/xpconnect/tests/unit/test_writeToGlobalPrototype.js

@@ -20,7 +20,7 @@ function run_test()
 
   do_check_eq(a, 3);
   do_check_eq(b, 3);
-  // c is a lexical binding and does not write to the global prototype
+  do_check_eq(c, 3);
   do_check_eq(d, 3);
   do_check_eq(e(), 3);
 

mobile/android/tests/browser/chrome/test_session_form_data.html

@@ -22,9 +22,6 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 
-let gChromeWin;
-let gBrowserApp;
-
 setup_browser();
 
 // Make the timer global so it doesn't get GC'd
@@ -85,6 +82,9 @@ function getInputValue(browser, data) {
 
 let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
 
+let gChromeWin;
+let gBrowserApp;
+
 // Wait 2 seconds for the async Java/JS messsaging dance to settle down. We don't have
 // enough pre/post events, messages or notifications to handle this without a delay.
 const CLOSE_TAB_WAIT = 2000;

testing/marionette/driver.js

@@ -6,7 +6,7 @@
 
 const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
-var loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
+const loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
     .getService(Ci.mozIJSSubScriptLoader);
 
 Cu.import("resource://gre/modules/FileUtils.jsm");
@@ -42,7 +42,7 @@ loader.loadSubScript("chrome://marionette/content/frame-manager.js");
 
 this.EXPORTED_SYMBOLS = ["GeckoDriver", "Context"];
 
-var FRAME_SCRIPT = "chrome://marionette/content/listener.js";
+const FRAME_SCRIPT = "chrome://marionette/content/listener.js";
 const BROWSER_STARTUP_FINISHED = "browser-delayed-startup-finished";
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 const CLICK_TO_START_PREF = "marionette.debugging.clicktostart";
@@ -941,7 +941,7 @@ GeckoDriver.prototype.execute = function(cmd, resp, directInject) {
     };
 
     if (!directInject) {
-      script = "var func = function() { " + script + " }; func.apply(null, __marionetteParams);";
+      script = "let func = function() { " + script + " }; func.apply(null, __marionetteParams);";
     }
     this.executeScriptInSandbox(
         resp,
@@ -1174,8 +1174,8 @@ GeckoDriver.prototype.executeWithCallback = function(cmd, resp, directInject) {
 
       if (!directInject) {
         script =  "__marionetteParams.push(returnFunc);" +
-            "var marionetteScriptFinished = returnFunc;" +
+            "let marionetteScriptFinished = returnFunc;" +
-            "var __marionetteFunc = function() {" + script + "};" +
+            "let __marionetteFunc = function() {" + script + "};" +
             "__marionetteFunc.apply(null, __marionetteParams);";
       }
 

testing/marionette/listener.js

@@ -624,7 +624,7 @@ function executeScript(msg, directInject) {
         return;
       }
 
-      script = "var __marionetteFunc = function(){" + script + "};" +
+      script = "let __marionetteFunc = function(){" + script + "};" +
                    "__marionetteFunc.apply(null, __marionetteParams);";
       if (importedScripts.exists()) {
         let stream = Components.classes["@mozilla.org/network/file-input-stream;1"].
@@ -776,7 +776,7 @@ function executeWithCallback(msg, useFinish) {
     }
 
     scriptSrc = "__marionetteParams.push(marionetteScriptFinished);" +
-                "var __marionetteFunc = function() { " + script + "};" +
+                "let __marionetteFunc = function() { " + script + "};" +
                 "__marionetteFunc.apply(null, __marionetteParams); ";
   }
 

testing/marionette/server.js

@@ -6,7 +6,7 @@
 
 const {Constructor: CC, classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
-var loader = Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader);
+const loader = Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader);
 const ServerSocket = CC("@mozilla.org/network/server-socket;1", "nsIServerSocket", "initSpecialConnection");
 
 Cu.import("resource://gre/modules/Log.jsm");

testing/mochitest/b2g_start_script.js

@@ -84,7 +84,7 @@ container.addEventListener('mozbrowsershowmodalprompt', function (e) {
 
 if (outOfProcess) {
   let specialpowers = {};
-  let loader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader);
+  let loader = Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader);
   loader.loadSubScript("chrome://specialpowers/content/SpecialPowersObserver.js", specialpowers);
   let specialPowersObserver = new specialpowers.SpecialPowersObserver();
 
@@ -103,7 +103,7 @@ if (outOfProcess) {
 }
 
 if (chrome) {
-  let loader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader);
+  let loader = Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader);
   if (typeof(SpecialPowers) == 'undefined') {
     loader.loadSubScript("chrome://specialpowers/content/specialpowersAPI.js");
     loader.loadSubScript("chrome://specialpowers/content/SpecialPowersObserverAPI.js");
@@ -114,7 +114,7 @@ if (chrome) {
 }
 
 if (onDevice) {
-  var cpuLock = Components.classes["@mozilla.org/power/powermanagerservice;1"]
+  var cpuLock = Cc["@mozilla.org/power/powermanagerservice;1"]
                       .getService(Ci.nsIPowerManagerService)
                       .newWakeLock("cpu");
 

testing/mochitest/tests/SimpleTest/EventUtils.js

@@ -958,26 +958,14 @@ function _getDOMWindowUtils(aWindow)
                                getInterface(_EU_Ci.nsIDOMWindowUtils);
 }
 
-function _defineConstant(name, value) {
-  Object.defineProperty(this, name, {
-    value: value,
-    enumerable: true,
-    writable: false
-  });
-}
-
 const COMPOSITION_ATTR_RAW_CLAUSE =
   _EU_Ci.nsITextInputProcessor.ATTR_RAW_CLAUSE;
-_defineConstant("COMPOSITION_ATTR_RAW_CLAUSE", COMPOSITION_ATTR_RAW_CLAUSE);
 const COMPOSITION_ATTR_SELECTED_RAW_CLAUSE =
   _EU_Ci.nsITextInputProcessor.ATTR_SELECTED_RAW_CLAUSE;
-_defineConstant("COMPOSITION_ATTR_SELECTED_RAW_CLAUSE", COMPOSITION_ATTR_SELECTED_RAW_CLAUSE);
 const COMPOSITION_ATTR_CONVERTED_CLAUSE =
   _EU_Ci.nsITextInputProcessor.ATTR_CONVERTED_CLAUSE;
-_defineConstant("COMPOSITION_ATTR_CONVERTED_CLAUSE", COMPOSITION_ATTR_CONVERTED_CLAUSE);
 const COMPOSITION_ATTR_SELECTED_CLAUSE =
   _EU_Ci.nsITextInputProcessor.ATTR_SELECTED_CLAUSE;
-_defineConstant("COMPOSITION_ATTR_SELECTED_CLAUSE", COMPOSITION_ATTR_SELECTED_CLAUSE);
 
 var TIPMap = new WeakMap();
 

testing/talos/talos/talos-powers/components/TalosPowersService.js

@@ -72,4 +72,4 @@ TalosPowersService.prototype = {
   },
 };
 
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TalosPowersService]);
+const NSGetFactory = XPCOMUtils.generateNSGetFactory([TalosPowersService]);

toolkit/components/places/UnifiedComplete.js

@@ -11,14 +11,6 @@
 
 const { classes: Cc, interfaces: Ci, results: Cr, utils: Cu } = Components;
 
-// Match type constants.
-// These indicate what type of search function we should be using.
-const MATCH_ANYWHERE = Ci.mozIPlacesAutoComplete.MATCH_ANYWHERE;
-const MATCH_BOUNDARY_ANYWHERE = Ci.mozIPlacesAutoComplete.MATCH_BOUNDARY_ANYWHERE;
-const MATCH_BOUNDARY = Ci.mozIPlacesAutoComplete.MATCH_BOUNDARY;
-const MATCH_BEGINNING = Ci.mozIPlacesAutoComplete.MATCH_BEGINNING;
-const MATCH_BEGINNING_CASE_SENSITIVE = Ci.mozIPlacesAutoComplete.MATCH_BEGINNING_CASE_SENSITIVE;
-
 const PREF_BRANCH = "browser.urlbar.";
 
 // Prefs are defined as [pref name, default value].
@@ -48,6 +40,14 @@ const PREF_SUGGEST_SEARCHES =       [ "suggest.searches",       false ];
 
 const PREF_MAX_CHARS_FOR_SUGGEST =  [ "maxCharsForSearchSuggestions", 20];
 
+// Match type constants.
+// These indicate what type of search function we should be using.
+const MATCH_ANYWHERE = Ci.mozIPlacesAutoComplete.MATCH_ANYWHERE;
+const MATCH_BOUNDARY_ANYWHERE = Ci.mozIPlacesAutoComplete.MATCH_BOUNDARY_ANYWHERE;
+const MATCH_BOUNDARY = Ci.mozIPlacesAutoComplete.MATCH_BOUNDARY;
+const MATCH_BEGINNING = Ci.mozIPlacesAutoComplete.MATCH_BEGINNING;
+const MATCH_BEGINNING_CASE_SENSITIVE = Ci.mozIPlacesAutoComplete.MATCH_BEGINNING_CASE_SENSITIVE;
+
 // AutoComplete query type constants.
 // Describes the various types of queries that we can process rows for.
 const QUERYTYPE_FILTERED            = 0;

toolkit/components/places/tests/unit/test_null_interfaces.js

@@ -6,6 +6,8 @@
  * Test bug 489872 to make sure passing nulls to nsNavHistory doesn't crash.
  */
 
+var Cr = Components.results;
+
 // Make an array of services to test, each specifying a class id, interface
 // and an array of function names that don't throw when passed nulls
 var testServices = [

toolkit/components/thumbnails/BackgroundPageThumbs.jsm

@@ -12,15 +12,6 @@ const FRAME_SCRIPT_URL = "chrome://global/content/backgroundPageThumbsContent.js
 
 const TELEMETRY_HISTOGRAM_ID_PREFIX = "FX_THUMBNAILS_BG_";
 
-const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-const HTML_NS = "http://www.w3.org/1999/xhtml";
-
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
-Cu.import("resource://gre/modules/PageThumbs.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
 // possible FX_THUMBNAILS_BG_CAPTURE_DONE_REASON_2 telemetry values
 const TEL_CAPTURE_DONE_OK = 0;
 const TEL_CAPTURE_DONE_TIMEOUT = 1;
@@ -28,11 +19,13 @@ const TEL_CAPTURE_DONE_TIMEOUT = 1;
 const TEL_CAPTURE_DONE_CRASHED = 4;
 const TEL_CAPTURE_DONE_BAD_URI = 5;
 
-// These are looked up on the global as properties below.
+const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-XPCOMUtils.defineConstant(this, "TEL_CAPTURE_DONE_OK", TEL_CAPTURE_DONE_OK);
+const HTML_NS = "http://www.w3.org/1999/xhtml";
-XPCOMUtils.defineConstant(this, "TEL_CAPTURE_DONE_TIMEOUT", TEL_CAPTURE_DONE_TIMEOUT);
+
-XPCOMUtils.defineConstant(this, "TEL_CAPTURE_DONE_CRASHED", TEL_CAPTURE_DONE_CRASHED);
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-XPCOMUtils.defineConstant(this, "TEL_CAPTURE_DONE_BAD_URI", TEL_CAPTURE_DONE_BAD_URI);
+
+Cu.import("resource://gre/modules/PageThumbs.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
 
 const global = this;
 
@@ -258,12 +251,6 @@ const BackgroundPageThumbs = {
   _destroyBrowserTimeout: DESTROY_BROWSER_TIMEOUT,
 };
 
-Object.defineProperty(this, "BackgroundPageThumbs", {
-  value: BackgroundPageThumbs,
-  enumerable: true,
-  writable: false
-});
-
 /**
  * Represents a single capture request in the capture queue.
  *
@@ -366,9 +353,8 @@ Capture.prototype = {
     let { captureCallback, doneCallbacks, options } = this;
     this.destroy();
 
-    if (typeof(reason) != "number") {
+    if (typeof(reason) != "number")
       throw new Error("A done reason must be given.");
-    }
     tel("CAPTURE_DONE_REASON_2", reason);
     if (data && data.telemetry) {
       // Telemetry is currently disabled in the content process (bug 680508).

toolkit/components/thumbnails/test/browser_thumbnails_expiration.js

@@ -11,8 +11,7 @@ Cc["@mozilla.org/moz/jssubscript-loader;1"]
   .getService(Ci.mozIJSSubScriptLoader)
   .loadSubScript("resource://gre/modules/PageThumbs.jsm", tmp);
 
-const EXPIRATION_MIN_CHUNK_SIZE = 50;
+const {EXPIRATION_MIN_CHUNK_SIZE, PageThumbsExpiration} = tmp;
-const {PageThumbsExpiration} = tmp;
 
 function runTests() {
   // Create dummy URLs.

toolkit/content/contentAreaUtils.js

@@ -260,10 +260,8 @@ DownloadListener.prototype = {
 }
 
 const kSaveAsType_Complete = 0; // Save document with attached objects.
-XPCOMUtils.defineConstant(this, "kSaveAsType_Complete", 0);
 // const kSaveAsType_URL      = 1; // Save document or URL by itself.
 const kSaveAsType_Text     = 2; // Save document, converting to plain text.
-XPCOMUtils.defineConstant(this, "kSaveAsType_Text", kSaveAsType_Text);
 
 /**
  * internalSave: Used when saving a document or URL.
@@ -789,13 +787,10 @@ function DownloadURL(aURL, aFileName, aInitiatingDocument) {
 
 // We have no DOM, and can only save the URL as is.
 const SAVEMODE_FILEONLY      = 0x00;
-XPCOMUtils.defineConstant(this, "SAVEMODE_FILEONLY", SAVEMODE_FILEONLY);
 // We have a DOM and can save as complete.
 const SAVEMODE_COMPLETE_DOM  = 0x01;
-XPCOMUtils.defineConstant(this, "SAVEMODE_COMPLETE_DOM", SAVEMODE_COMPLETE_DOM);
 // We have a DOM which we can serialize as text.
 const SAVEMODE_COMPLETE_TEXT = 0x02;
-XPCOMUtils.defineConstant(this, "SAVEMODE_COMPLETE_TEXT", SAVEMODE_COMPLETE_TEXT);
 
 // If we are able to save a complete DOM, the 'save as complete' filter
 // must be the first filter appended.  The 'save page only' counterpart

toolkit/content/widgets/autocomplete.xml

@@ -153,11 +153,9 @@
       </field>
 
       <field name="PrivateBrowsingUtils" readonly="true">
-        {
+        let utils = {};
-          let utils = {};
+        Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm", utils);
-          Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm", utils);
+        utils.PrivateBrowsingUtils
-          utils.PrivateBrowsingUtils
-        }
       </field>
 
       <property name="inPrivateContext" readonly="true"

toolkit/content/widgets/tabbox.xml

@@ -779,11 +779,9 @@
 #endif
       </field>
       <field name="TelemetryStopwatch" readonly="true">
-        {
+        let tmp = {};
-          let tmp = {};
+        Cu.import("resource://gre/modules/TelemetryStopwatch.jsm", tmp);
-          Cu.import("resource://gre/modules/TelemetryStopwatch.jsm", tmp);
+        tmp.TelemetryStopwatch;
-          tmp.TelemetryStopwatch;
-        }
       </field>
     </implementation>
 

toolkit/modules/WindowsRegistry.jsm

@@ -7,7 +7,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
 this.EXPORTED_SYMBOLS = ["WindowsRegistry"];
 
-var WindowsRegistry = {
+const WindowsRegistry = {
   /**
    * Safely reads a value from the registry.
    *

toolkit/mozapps/extensions/internal/GMPProvider.jsm

@@ -70,7 +70,6 @@ const GMP_PLUGINS = [
     missingKey:      "VIDEO_ADOBE_GMP_DISAPPEARED",
     missingFilesKey: "VIDEO_ADOBE_GMP_MISSING_FILES",
   }];
-XPCOMUtils.defineConstant(this, "GMP_PLUGINS", GMP_PLUGINS);
 
 XPCOMUtils.defineLazyGetter(this, "pluginsBundle",
   () => Services.strings.createBundle("chrome://global/locale/plugins.properties"));

toolkit/mozapps/extensions/internal/XPIProvider.jsm

@@ -157,7 +157,6 @@ const XPI_SIGNATURE_CHECK_PERIOD      = 24 * 60 * 60;
 
 // The value for this is in Makefile.in
 #expand const DB_SCHEMA                       = __MOZ_EXTENSIONS_DB_SCHEMA__;
-XPCOMUtils.defineConstant(this, "DB_SCHEMA", DB_SCHEMA);
 const NOTIFICATION_TOOLBOXPROCESS_LOADED      = "ToolboxProcessLoaded";
 
 // Properties that exist in the install manifest