Skip to content

Instantly share code, notes, and snippets.

@kmaglione

kmaglione/stdin.diff Secret

Created January 16, 2019 21:46
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save kmaglione/ee5041b717b0025828b572aeee89159d to your computer and use it in GitHub Desktop.
Save kmaglione/ee5041b717b0025828b572aeee89159d to your computer and use it in GitHub Desktop.
Download ZIP
Raw
stdin.diff
This file has been truncated, but you can view the full file.
# HG changeset patch
# User Kris Maglione <maglione.k@gmail.com>
# Date 1547261659 28800
# Fri Jan 11 18:54:19 2019 -0800
# Node ID 9d7c2cc68a13da93797b1b3822969bc5a4059570
# Parent 81c25e753faedf9b7547a320109a86211ef416a8
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. r=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
diff --git accessible/jsat/AccessFu.jsm accessible/jsat/AccessFu.jsm
--- accessible/jsat/AccessFu.jsm
+++ accessible/jsat/AccessFu.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["AccessFu"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Logger, Utils} = ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "Rect",
"resource://gre/modules/Geometry.jsm");
const GECKOVIEW_MESSAGE = {
ACTIVATE: "GeckoView:AccessibilityActivate",
BY_GRANULARITY: "GeckoView:AccessibilityByGranularity",
CLIPBOARD: "GeckoView:AccessibilityClipboard",
CURSOR_TO_FOCUSED: "GeckoView:AccessibilityCursorToFocused",
@@ -46,17 +46,17 @@ var AccessFu = {
* Start AccessFu mode.
*/
enable: function enable() {
if (this._enabled) {
return;
}
this._enabled = true;
- ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
+ const {Logger, Utils} = ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
Services.obs.addObserver(this, "remote-browser-shown");
Services.obs.addObserver(this, "inprocess-browser-shown");
Services.ww.registerNotification(this);
for (let win of Services.wm.getEnumerator(null)) {
this._attachWindow(win);
}
diff --git accessible/jsat/Constants.jsm accessible/jsat/Constants.jsm
--- accessible/jsat/Constants.jsm
+++ accessible/jsat/Constants.jsm
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
const AndroidEvents = {
VIEW_CLICKED: 0x01,
VIEW_LONG_CLICKED: 0x02,
VIEW_SELECTED: 0x04,
VIEW_FOCUSED: 0x08,
VIEW_TEXT_CHANGED: 0x10,
WINDOW_STATE_CHANGED: 0x20,
diff --git accessible/jsat/Traversal.jsm accessible/jsat/Traversal.jsm
--- accessible/jsat/Traversal.jsm
+++ accessible/jsat/Traversal.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["TraversalRules", "TraversalHelper"]; // jshint ignore:line
-ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
+const {PrefCache, Utils} = ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "Roles", // jshint ignore:line
"resource://gre/modules/accessibility/Constants.jsm");
ChromeUtils.defineModuleGetter(this, "Filters", // jshint ignore:line
"resource://gre/modules/accessibility/Constants.jsm");
ChromeUtils.defineModuleGetter(this, "States", // jshint ignore:line
"resource://gre/modules/accessibility/Constants.jsm");
ChromeUtils.defineModuleGetter(this, "Prefilters", // jshint ignore:line
"resource://gre/modules/accessibility/Constants.jsm");
diff --git accessible/tests/mochitest/browser.js accessible/tests/mochitest/browser.js
--- accessible/tests/mochitest/browser.js
+++ accessible/tests/mochitest/browser.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+var {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
/**
* Load the browser with the given url and then invokes the given function.
*/
function openBrowserWindow(aFunc, aURL, aRect) {
gBrowserContext.testFunc = aFunc;
gBrowserContext.startURL = aURL;
gBrowserContext.browserRect = aRect;
@@ -86,17 +86,17 @@ function urlbarInput() {
*/
function reloadButton() {
return browserWindow().document.getElementById("urlbar-reload-button");
}
// //////////////////////////////////////////////////////////////////////////////
// private section
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var gBrowserContext =
{
browserWnd: null,
testFunc: null,
startURL: "",
};
diff --git accessible/tests/mochitest/common.js accessible/tests/mochitest/common.js
--- accessible/tests/mochitest/common.js
+++ accessible/tests/mochitest/common.js
@@ -82,17 +82,17 @@ const kDiscBulletText = kDiscBulletChar
const kCircleBulletText = String.fromCharCode(0x25e6) + " ";
const kSquareBulletText = String.fromCharCode(0x25fe) + " ";
const MAX_TRIM_LENGTH = 100;
/**
* Services to determine if e10s is enabled.
*/
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
/**
* nsIAccessibilityService service.
*/
var gAccService = Cc["@mozilla.org/accessibilityService;1"].
getService(nsIAccessibilityService);
/**
diff --git accessible/tests/mochitest/events.js accessible/tests/mochitest/events.js
--- accessible/tests/mochitest/events.js
+++ accessible/tests/mochitest/events.js
@@ -35,17 +35,17 @@ const EVENT_TEXT_VALUE_CHANGE = nsIAcces
const EVENT_VIRTUALCURSOR_CHANGED = nsIAccessibleEvent.EVENT_VIRTUALCURSOR_CHANGED;
const kNotFromUserInput = 0;
const kFromUserInput = 1;
// //////////////////////////////////////////////////////////////////////////////
// General
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
/**
* Set up this variable to dump events into DOM.
*/
var gA11yEventDumpID = "";
/**
* Set up this variable to dump event processing into console.
diff --git accessible/tests/mochitest/events/docload/test_docload_root.html accessible/tests/mochitest/events/docload/test_docload_root.html
--- accessible/tests/mochitest/events/docload/test_docload_root.html
+++ accessible/tests/mochitest/events/docload/test_docload_root.html
@@ -83,17 +83,17 @@
}
// //////////////////////////////////////////////////////////////////////////
// Do tests
function doTests() {
// Front end stuff sometimes likes to stuff things in the hidden window(s)
// in which case we should repress all accessibles for those.
- ChromeUtils.import("resource://gre/modules/Services.jsm");
+ const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Try to create an accessible for the hidden window's document.
let doc = Services.appShell.hiddenDOMWindow.document;
let hiddenDocAcc = gAccService.getAccessibleFor(doc);
ok(!hiddenDocAcc, "hiddenDOMWindow should not have an accessible.");
// Try to create an accessible for the private hidden window's doc.
let privateDoc = Services.appShell.hiddenPrivateDOMWindow.document;
diff --git accessible/tests/mochitest/events/docload/test_docload_shutdown.html accessible/tests/mochitest/events/docload/test_docload_shutdown.html
--- accessible/tests/mochitest/events/docload/test_docload_shutdown.html
+++ accessible/tests/mochitest/events/docload/test_docload_shutdown.html
@@ -105,17 +105,17 @@
}
// //////////////////////////////////////////////////////////////////////////
// Do tests
function doTests() {
// Front end stuff sometimes likes to stuff things in the hidden window(s)
// in which case we should repress all accessibles for those.
- ChromeUtils.import("resource://gre/modules/Services.jsm");
+ const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Try to create an accessible for the hidden window's document.
let doc = Services.appShell.hiddenDOMWindow.document;
let hiddenDocAcc = gAccService.getAccessibleFor(doc);
ok(!hiddenDocAcc, "hiddenDOMWindow should not have an accessible.");
// Try to create an accessible for the private hidden window's doc.
diff --git accessible/tests/mochitest/events/test_textattrchange.html accessible/tests/mochitest/events/test_textattrchange.html
--- accessible/tests/mochitest/events/test_textattrchange.html
+++ accessible/tests/mochitest/events/test_textattrchange.html
@@ -19,17 +19,17 @@
src="../states.js"></script>
<script type="application/javascript"
src="../events.js"></script>
<script type="application/javascript"
src="../attributes.js"></script>
<script type="application/javascript">
- ChromeUtils.import("resource://gre/modules/InlineSpellChecker.jsm");
+ const {InlineSpellChecker} = ChromeUtils.import("resource://gre/modules/InlineSpellChecker.jsm");
function spelledTextInvoker(aID) {
this.DOMNode = getNode(aID);
this.eventSeq = [
new invokerChecker(EVENT_TEXT_ATTRIBUTE_CHANGED, this.DOMNode),
];
diff --git accessible/tests/mochitest/jsat/jsatcommon.js accessible/tests/mochitest/jsat/jsatcommon.js
--- accessible/tests/mochitest/jsat/jsatcommon.js
+++ accessible/tests/mochitest/jsat/jsatcommon.js
@@ -9,18 +9,18 @@
* A global variable holding an array of test functions.
*/
var gTestFuncs = [];
/**
* A global Iterator for the array of test functions.
*/
var gIterator;
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Logger, Utils} = ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
const MovementGranularity = {
CHARACTER: 1,
WORD: 2,
LINE: 4,
PARAGRAPH: 8,
};
@@ -138,17 +138,17 @@ var AccessFuTest = {
yield testFunc;
}
})();
Logger.useConsoleService = true;
Logger.logLevel = Logger.DEBUG;
// Start AccessFu and put it in stand-by.
- ChromeUtils.import("resource://gre/modules/accessibility/AccessFu.jsm");
+ const {AccessFu} = ChromeUtils.import("resource://gre/modules/accessibility/AccessFu.jsm");
var prefs = [["accessibility.accessfu.notify_output", 1]];
prefs.push.apply(prefs, aAdditionalPrefs);
SpecialPowers.pushPrefEnv({ "set": prefs }, function() {
if (AccessFuTest._waitForExplicitFinish) {
// Run all test functions asynchronously.
AccessFuTest.nextTest();
@@ -208,17 +208,17 @@ class AccessFuContentTestRunner {
isFocused(aExpected) {
var doc = currentTabDocument();
SimpleTest.is(doc.activeElement, doc.querySelector(aExpected),
"Correct element is focused: " + aExpected);
}
async setupMessageManager(aMessageManager) {
function contentScript() {
- ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
+ const {Logger, Utils} = ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
Logger.logLevel = "DEBUG";
Utils.inTest = true;
addMessageListener("AccessFuTest:Focus", aMessage => {
var elem = content.document.querySelector(aMessage.data.selector);
if (elem) {
elem.focus();
}
diff --git accessible/tests/mochitest/jsat/output.js accessible/tests/mochitest/jsat/output.js
--- accessible/tests/mochitest/jsat/output.js
+++ accessible/tests/mochitest/jsat/output.js
@@ -1,11 +1,11 @@
const PREF_UTTERANCE_ORDER = "accessibility.accessfu.utterance";
-ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
+const {PivotContext} = ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.import("resource://gre/modules/accessibility/OutputGenerator.jsm", this);
/**
* Test context output generation.
*
* @param expected {Array} expected output.
* @param aAccOrElmOrID identifier to get an accessible to test.
* @param aOldAccOrElmOrID optional identifier to get an accessible relative to
diff --git accessible/tests/mochitest/jsat/test_traversal.html accessible/tests/mochitest/jsat/test_traversal.html
--- accessible/tests/mochitest/jsat/test_traversal.html
+++ accessible/tests/mochitest/jsat/test_traversal.html
@@ -16,17 +16,17 @@
<script type="application/javascript" src="../browser.js"></script>
<script type="application/javascript" src="../events.js"></script>
<script type="application/javascript" src="../role.js"></script>
<script type="application/javascript" src="../states.js"></script>
<script type="application/javascript" src="../pivot.js"></script>
<script type="application/javascript" src="../layout.js"></script>
<script type="application/javascript">
- ChromeUtils.import("resource://gre/modules/accessibility/Traversal.jsm");
+ const {TraversalRules} = ChromeUtils.import("resource://gre/modules/accessibility/Traversal.jsm");
var gBrowserWnd = null;
var gQueue = null;
function doTest() {
var doc = currentTabDocument();
var docAcc = getAccessible(doc, [nsIAccessibleDocument]);
gQueue = new eventQueue();
diff --git accessible/tests/mochitest/jsat/test_traversal_helper.html accessible/tests/mochitest/jsat/test_traversal_helper.html
--- accessible/tests/mochitest/jsat/test_traversal_helper.html
+++ accessible/tests/mochitest/jsat/test_traversal_helper.html
@@ -16,17 +16,17 @@
<script type="application/javascript" src="../browser.js"></script>
<script type="application/javascript" src="../events.js"></script>
<script type="application/javascript" src="../role.js"></script>
<script type="application/javascript" src="../states.js"></script>
<script type="application/javascript" src="../pivot.js"></script>
<script type="application/javascript" src="../layout.js"></script>
<script type="application/javascript">
- ChromeUtils.import("resource://gre/modules/accessibility/Traversal.jsm");
+ const {TraversalHelper} = ChromeUtils.import("resource://gre/modules/accessibility/Traversal.jsm");
var vc;
function accessibleIs(aAccessible, aExpected, aMessage) {
if (!aAccessible && aAccessible == aExpected) {
ok(true, "Accessible is null. " + aMessage);
} else {
ok(aAccessible.DOMNode.id == aExpected || aAccessible.name == aExpected,
diff --git browser/actors/AboutReaderChild.jsm browser/actors/AboutReaderChild.jsm
--- browser/actors/AboutReaderChild.jsm
+++ browser/actors/AboutReaderChild.jsm
@@ -1,17 +1,17 @@
/* vim: set ts=2 sw=2 sts=2 et tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["AboutReaderChild"];
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
ChromeUtils.defineModuleGetter(this, "AboutReader",
"resource://gre/modules/AboutReader.jsm");
ChromeUtils.defineModuleGetter(this, "ReaderMode",
"resource://gre/modules/ReaderMode.jsm");
ChromeUtils.defineModuleGetter(this, "Readerable",
"resource://gre/modules/Readerable.jsm");
diff --git browser/actors/BlockedSiteChild.jsm browser/actors/BlockedSiteChild.jsm
--- browser/actors/BlockedSiteChild.jsm
+++ browser/actors/BlockedSiteChild.jsm
@@ -1,18 +1,18 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var EXPORTED_SYMBOLS = ["BlockedSiteChild"];
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
ChromeUtils.defineModuleGetter(this, "Utils",
"resource://gre/modules/sessionstore/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "SafeBrowsing",
"resource://gre/modules/SafeBrowsing.jsm");
function getSiteBlockedErrorDetails(docShell) {
let blockedInfo = {};
diff --git browser/actors/BrowserTabChild.jsm browser/actors/BrowserTabChild.jsm
--- browser/actors/BrowserTabChild.jsm
+++ browser/actors/BrowserTabChild.jsm
@@ -1,17 +1,17 @@
/* vim: set ts=2 sw=2 sts=2 et tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["BrowserTabChild"];
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
ChromeUtils.defineModuleGetter(this, "E10SUtils",
"resource://gre/modules/E10SUtils.jsm");
class BrowserTabChild extends ActorChild {
handleEvent(event) {
switch (event.type) {
case "DOMWindowCreated":
diff --git browser/actors/ClickHandlerChild.jsm browser/actors/ClickHandlerChild.jsm
--- browser/actors/ClickHandlerChild.jsm
+++ browser/actors/ClickHandlerChild.jsm
@@ -1,17 +1,17 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var EXPORTED_SYMBOLS = ["ClickHandlerChild"];
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "BrowserUtils",
"resource://gre/modules/BrowserUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
ChromeUtils.defineModuleGetter(this, "WebNavigationFrames",
"resource://gre/modules/WebNavigationFrames.jsm");
diff --git browser/actors/ContentSearchChild.jsm browser/actors/ContentSearchChild.jsm
--- browser/actors/ContentSearchChild.jsm
+++ browser/actors/ContentSearchChild.jsm
@@ -1,17 +1,17 @@
/* vim: set ts=2 sw=2 sts=2 et tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["ContentSearchChild"];
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
class ContentSearchChild extends ActorChild {
handleEvent(event) {
this._sendMsg(event.detail.type, event.detail.data);
}
receiveMessage(msg) {
this._fireEvent(msg.data.type, msg.data.data);
diff --git browser/actors/ContextMenuChild.jsm browser/actors/ContextMenuChild.jsm
--- browser/actors/ContextMenuChild.jsm
+++ browser/actors/ContextMenuChild.jsm
@@ -3,20 +3,20 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["ContextMenuChild"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
XPCOMUtils.defineLazyModuleGetters(this, {
E10SUtils: "resource://gre/modules/E10SUtils.jsm",
BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
findAllCssSelectors: "resource://gre/modules/css-selector.js",
SpellCheckHelper: "resource://gre/modules/InlineSpellChecker.jsm",
diff --git browser/actors/DOMFullscreenChild.jsm browser/actors/DOMFullscreenChild.jsm
--- browser/actors/DOMFullscreenChild.jsm
+++ browser/actors/DOMFullscreenChild.jsm
@@ -1,17 +1,17 @@
/* vim: set ts=2 sw=2 sts=2 et tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["DOMFullscreenChild"];
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
class DOMFullscreenChild extends ActorChild {
receiveMessage(aMessage) {
let windowUtils = this.content && this.content.windowUtils;
switch (aMessage.name) {
case "DOMFullscreen:Entered": {
this._lastTransactionId = windowUtils.lastTransactionId;
if (!windowUtils.handleFullscreenRequests() &&
diff --git browser/actors/FormSubmitChild.jsm browser/actors/FormSubmitChild.jsm
--- browser/actors/FormSubmitChild.jsm
+++ browser/actors/FormSubmitChild.jsm
@@ -5,19 +5,19 @@
/*
* Handles the validation callback from nsIFormFillController and
* the display of the help panel on invalid elements.
*/
var EXPORTED_SYMBOLS = ["FormSubmitChild"];
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
-ChromeUtils.import("resource://gre/modules/BrowserUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {BrowserUtils} = ChromeUtils.import("resource://gre/modules/BrowserUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
class FormSubmitChild extends ActorChild {
constructor(dispatcher) {
super(dispatcher);
this._validationMessage = "";
this._element = null;
diff --git browser/actors/LightWeightThemeInstallChild.jsm browser/actors/LightWeightThemeInstallChild.jsm
--- browser/actors/LightWeightThemeInstallChild.jsm
+++ browser/actors/LightWeightThemeInstallChild.jsm
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var EXPORTED_SYMBOLS = ["LightWeightThemeInstallChild"];
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
class LightWeightThemeInstallChild extends ActorChild {
handleEvent(event) {
let {mm} = this;
switch (event.type) {
case "InstallBrowserTheme": {
mm.sendAsyncMessage("LightWeightThemeWebInstaller:Install", {
baseURI: event.target.baseURI,
diff --git browser/actors/LightweightThemeChild.jsm browser/actors/LightweightThemeChild.jsm
--- browser/actors/LightweightThemeChild.jsm
+++ browser/actors/LightweightThemeChild.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["LightweightThemeChild"];
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
/**
* LightweightThemeChild forwards theme data to in-content pages.
* It is both instantiated by the traditional Actor mechanism,
* and also manually within the sidebar JS global (which has no message manager)
*/
class LightweightThemeChild extends ActorChild {
constructor(dispatcher) {
diff --git browser/actors/LinkHandlerChild.jsm browser/actors/LinkHandlerChild.jsm
--- browser/actors/LinkHandlerChild.jsm
+++ browser/actors/LinkHandlerChild.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const EXPORTED_SYMBOLS = ["LinkHandlerChild"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
ChromeUtils.defineModuleGetter(this, "FaviconLoader",
"resource:///modules/FaviconLoader.jsm");
class LinkHandlerChild extends ActorChild {
constructor(dispatcher) {
super(dispatcher);
diff --git browser/actors/NetErrorChild.jsm browser/actors/NetErrorChild.jsm
--- browser/actors/NetErrorChild.jsm
+++ browser/actors/NetErrorChild.jsm
@@ -1,18 +1,18 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var EXPORTED_SYMBOLS = ["NetErrorChild"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
ChromeUtils.defineModuleGetter(this, "BrowserUtils",
"resource://gre/modules/BrowserUtils.jsm");
ChromeUtils.defineModuleGetter(this, "WebNavigationFrames",
"resource://gre/modules/WebNavigationFrames.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
diff --git browser/actors/OfflineAppsChild.jsm browser/actors/OfflineAppsChild.jsm
--- browser/actors/OfflineAppsChild.jsm
+++ browser/actors/OfflineAppsChild.jsm
@@ -1,18 +1,18 @@
/* vim: set ts=2 sw=2 sts=2 et tw=80: */
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var EXPORTED_SYMBOLS = ["OfflineAppsChild"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
class OfflineAppsChild extends ActorChild {
constructor(dispatcher) {
super(dispatcher);
this._docId = 0;
this._docIdMap = new Map();
diff --git browser/actors/PageInfoChild.jsm browser/actors/PageInfoChild.jsm
--- browser/actors/PageInfoChild.jsm
+++ browser/actors/PageInfoChild.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var EXPORTED_SYMBOLS = ["PageInfoChild"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
setTimeout: "resource://gre/modules/Timer.jsm",
});
class PageInfoChild extends ActorChild {
/* nsIMessageListener */
diff --git browser/actors/PageStyleChild.jsm browser/actors/PageStyleChild.jsm
--- browser/actors/PageStyleChild.jsm
+++ browser/actors/PageStyleChild.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var EXPORTED_SYMBOLS = ["PageStyleChild"];
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
class PageStyleChild extends ActorChild {
getViewer(content) {
return content.docShell.contentViewer;
}
sendStyleSheetInfo(mm) {
let content = mm.content;
diff --git browser/actors/PluginChild.jsm browser/actors/PluginChild.jsm
--- browser/actors/PluginChild.jsm
+++ browser/actors/PluginChild.jsm
@@ -1,21 +1,21 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["PluginChild"];
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/BrowserUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {BrowserUtils} = ChromeUtils.import("resource://gre/modules/BrowserUtils.jsm");
ChromeUtils.defineModuleGetter(this, "ContextMenuChild",
"resource:///actors/ContextMenuChild.jsm");
XPCOMUtils.defineLazyGetter(this, "gNavigatorBundle", function() {
const url = "chrome://browser/locale/browser.properties";
return Services.strings.createBundle(url);
});
diff --git browser/actors/SearchTelemetryChild.jsm browser/actors/SearchTelemetryChild.jsm
--- browser/actors/SearchTelemetryChild.jsm
+++ browser/actors/SearchTelemetryChild.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["SearchTelemetryChild"];
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const SHARED_DATA_KEY = "SearchTelemetry:ProviderInfo";
/**
* SearchProviders looks after keeping track of the search provider information
* received from the main process.
*
* It is separate to SearchTelemetryChild so that it is not constructed for each
diff --git browser/actors/URIFixupChild.jsm browser/actors/URIFixupChild.jsm
--- browser/actors/URIFixupChild.jsm
+++ browser/actors/URIFixupChild.jsm
@@ -1,17 +1,17 @@
/* vim: set ts=2 sw=2 sts=2 et tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["URIFixupChild"];
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
class URIFixupChild extends ActorChild {
observe(subject) {
let fixupInfo = subject.QueryInterface(Ci.nsIURIFixupInfo);
if (!fixupInfo.consumer) {
return;
}
diff --git browser/actors/WebRTCChild.jsm browser/actors/WebRTCChild.jsm
--- browser/actors/WebRTCChild.jsm
+++ browser/actors/WebRTCChild.jsm
@@ -1,20 +1,20 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["WebRTCChild"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "MediaManagerService",
"@mozilla.org/mediaManagerService;1",
"nsIMediaManagerService");
const kBrowserURL = AppConstants.BROWSER_CHROME_URL;
class WebRTCChild extends ActorChild {
// Called only for 'unload' to remove pending gUM prompts in reloaded frames.
diff --git browser/base/content/aboutDialog-appUpdater.js browser/base/content/aboutDialog-appUpdater.js
--- browser/base/content/aboutDialog-appUpdater.js
+++ browser/base/content/aboutDialog-appUpdater.js
@@ -2,18 +2,18 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// Note: this file is included in aboutDialog.xul and preferences/advanced.xul
// if MOZ_UPDATER is defined.
/* import-globals-from aboutDialog.js */
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/DownloadUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {DownloadUtils} = ChromeUtils.import("resource://gre/modules/DownloadUtils.jsm");
ChromeUtils.defineModuleGetter(this, "UpdateUtils",
"resource://gre/modules/UpdateUtils.jsm");
const PREF_APP_UPDATE_CANCELATIONS_OSX = "app.update.cancelations.osx";
const PREF_APP_UPDATE_ELEVATE_NEVER = "app.update.elevate.never";
var gAppUpdater;
diff --git browser/base/content/aboutDialog.js browser/base/content/aboutDialog.js
--- browser/base/content/aboutDialog.js
+++ browser/base/content/aboutDialog.js
@@ -2,18 +2,18 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
/* import-globals-from aboutDialog-appUpdater.js */
// Services = object with smart getters for common XPCOM services
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
async function init(aEvent) {
if (aEvent.target != document)
return;
var distroId = Services.prefs.getCharPref("distribution.id", "");
if (distroId) {
var distroString = distroId;
diff --git browser/base/content/aboutRestartRequired.js browser/base/content/aboutRestartRequired.js
--- browser/base/content/aboutRestartRequired.js
+++ browser/base/content/aboutRestartRequired.js
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* eslint-env mozilla/frame-script */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var AboutRestartRequired = {
/* Only do autofocus if we're the toplevel frame; otherwise we
don't want to call attention to ourselves! The key part is
that autofocus happens on insertion into the tree, so we
can remove the button, add @autofocus, and reinsert the
button.
*/
diff --git browser/base/content/browser-ctrlTab.js browser/base/content/browser-ctrlTab.js
--- browser/base/content/browser-ctrlTab.js
+++ browser/base/content/browser-ctrlTab.js
@@ -5,17 +5,17 @@
// This file is loaded into the browser window scope.
/* eslint-env mozilla/browser-window */
/**
* Tab previews utility, produces thumbnails
*/
var tabPreviews = {
get aspectRatio() {
- let { PageThumbUtils } = ChromeUtils.import("resource://gre/modules/PageThumbUtils.jsm", {});
+ let { PageThumbUtils } = ChromeUtils.import("resource://gre/modules/PageThumbUtils.jsm");
let [ width, height ] = PageThumbUtils.getThumbnailSize(window);
delete this.aspectRatio;
return this.aspectRatio = height / width;
},
get: function tabPreviews_get(aTab) {
let uri = aTab.linkedBrowser.currentURI.spec;
diff --git browser/base/content/browser-data-submission-info-bar.js browser/base/content/browser-data-submission-info-bar.js
--- browser/base/content/browser-data-submission-info-bar.js
+++ browser/base/content/browser-data-submission-info-bar.js
@@ -9,17 +9,17 @@ var gDataNotificationInfoBar = {
_OBSERVERS: [
"datareporting:notify-data-policy:request",
"datareporting:notify-data-policy:close",
],
_DATA_REPORTING_NOTIFICATION: "data-reporting",
get _log() {
- let { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm", {});
+ let { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
delete this._log;
return this._log = Log.repository.getLoggerWithMessagePrefix(
"Toolkit.Telemetry", "DataNotificationInfoBar::");
},
init() {
window.addEventListener("unload", () => {
for (let o of this._OBSERVERS) {
diff --git browser/base/content/browser-plugins.js browser/base/content/browser-plugins.js
--- browser/base/content/browser-plugins.js
+++ browser/base/content/browser-plugins.js
@@ -77,17 +77,17 @@ var gPluginHandler = {
// Callback for user clicking on a disabled plugin
managePlugins() {
BrowserOpenAddonsMgr("addons://list/plugin");
},
// Callback for user clicking on the link in a click-to-play plugin
// (where the plugin has an update)
async openPluginUpdatePage(pluginTag) {
- let { Blocklist } = ChromeUtils.import("resource://gre/modules/Blocklist.jsm", {});
+ let { Blocklist } = ChromeUtils.import("resource://gre/modules/Blocklist.jsm");
let url = await Blocklist.getPluginBlockURL(pluginTag);
openTrustedLinkIn(url, "tab");
},
submitReport: function submitReport(runID, keyVals, submitURLOptIn) {
if (!AppConstants.MOZ_CRASHREPORTER) {
return;
}
diff --git browser/base/content/browser-sync.js browser/base/content/browser-sync.js
--- browser/base/content/browser-sync.js
+++ browser/base/content/browser-sync.js
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// This file is loaded into the browser window scope.
/* eslint-env mozilla/browser-window */
-ChromeUtils.import("resource://services-sync/UIState.jsm");
+const {UIState} = ChromeUtils.import("resource://services-sync/UIState.jsm");
ChromeUtils.defineModuleGetter(this, "FxAccounts",
"resource://gre/modules/FxAccounts.jsm");
ChromeUtils.defineModuleGetter(this, "EnsureFxAccountsWebChannel",
"resource://gre/modules/FxAccountsWebChannel.jsm");
ChromeUtils.defineModuleGetter(this, "Weave",
"resource://services-sync/main.js");
diff --git browser/base/content/browser.js browser/base/content/browser.js
--- browser/base/content/browser.js
+++ browser/base/content/browser.js
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
ChromeUtils.import("resource://gre/modules/NotificationDB.jsm");
// lazy module getters
XPCOMUtils.defineLazyModuleGetters(this, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
@@ -170,17 +170,17 @@ XPCOMUtils.defineLazyGetter(this, "gBrow
});
XPCOMUtils.defineLazyGetter(this, "gTabBrowserBundle", () => {
return Services.strings.createBundle("chrome://browser/locale/tabbrowser.properties");
});
XPCOMUtils.defineLazyGetter(this, "gCustomizeMode", () => {
let { CustomizeMode } =
- ChromeUtils.import("resource:///modules/CustomizeMode.jsm", {});
+ ChromeUtils.import("resource:///modules/CustomizeMode.jsm");
return new CustomizeMode(window);
});
XPCOMUtils.defineLazyGetter(this, "gNavToolbox", () => {
return document.getElementById("navigator-toolbox");
});
XPCOMUtils.defineLazyGetter(this, "gURLBar", () => {
@@ -219,31 +219,31 @@ XPCOMUtils.defineLazyGetter(this, "gNoti
element.classList.add("global-notificationbox");
element.setAttribute("notificationside", "bottom");
document.getElementById("browser-bottombox").appendChild(element);
});
});
XPCOMUtils.defineLazyGetter(this, "InlineSpellCheckerUI", () => {
let { InlineSpellChecker } =
- ChromeUtils.import("resource://gre/modules/InlineSpellChecker.jsm", {});
+ ChromeUtils.import("resource://gre/modules/InlineSpellChecker.jsm");
return new InlineSpellChecker();
});
XPCOMUtils.defineLazyGetter(this, "PageMenuParent", () => {
// eslint-disable-next-line no-shadow
let { PageMenuParent } =
- ChromeUtils.import("resource://gre/modules/PageMenu.jsm", {});
+ ChromeUtils.import("resource://gre/modules/PageMenu.jsm");
return new PageMenuParent();
});
XPCOMUtils.defineLazyGetter(this, "PopupNotifications", () => {
// eslint-disable-next-line no-shadow
let { PopupNotifications } =
- ChromeUtils.import("resource://gre/modules/PopupNotifications.jsm", {});
+ ChromeUtils.import("resource://gre/modules/PopupNotifications.jsm");
try {
// Hide all notifications while the URL is being edited and the address bar
// has focus, including the virtual focus in the results popup.
// We also have to hide notifications explicitly when the window is
// minimized because of the effects of the "noautohide" attribute on Linux.
// This can be removed once bug 545265 and bug 1320361 are fixed.
let shouldSuppress = () => {
return window.windowState == window.STATE_MINIMIZED ||
@@ -263,17 +263,17 @@ XPCOMUtils.defineLazyGetter(this, "Popup
XPCOMUtils.defineLazyGetter(this, "Win7Features", () => {
if (AppConstants.platform != "win")
return null;
const WINTASKBAR_CONTRACTID = "@mozilla.org/windows-taskbar;1";
if (WINTASKBAR_CONTRACTID in Cc &&
Cc[WINTASKBAR_CONTRACTID].getService(Ci.nsIWinTaskbar).available) {
let { AeroPeek } =
- ChromeUtils.import("resource:///modules/WindowsPreviewPerTab.jsm", {});
+ ChromeUtils.import("resource:///modules/WindowsPreviewPerTab.jsm");
return {
onOpenWindow() {
AeroPeek.onOpenWindow(window);
this.handledOpening = true;
},
onCloseWindow() {
if (this.handledOpening) {
AeroPeek.onCloseWindow(window);
@@ -1411,17 +1411,17 @@ var gBrowserInit = {
_cancelDelayedStartup() {
window.removeEventListener("MozAfterPaint", this._boundDelayedStartup);
this._boundDelayedStartup = null;
},
_delayedStartup() {
let { TelemetryTimestamps } =
- ChromeUtils.import("resource://gre/modules/TelemetryTimestamps.jsm", {});
+ ChromeUtils.import("resource://gre/modules/TelemetryTimestamps.jsm");
TelemetryTimestamps.add("delayedStartupStarted");
this._cancelDelayedStartup();
// We need to set the OfflineApps message listeners up before we
// load homepages, which might need them.
OfflineApps.init();
@@ -1537,17 +1537,17 @@ var gBrowserInit = {
window.addEventListener("mousemove", MousePosTracker);
window.addEventListener("dragover", MousePosTracker);
gNavToolbox.addEventListener("customizationstarting", CustomizationHandler);
gNavToolbox.addEventListener("customizationending", CustomizationHandler);
if (AppConstants.platform == "linux") {
let { WindowDraggingElement } =
- ChromeUtils.import("resource://gre/modules/WindowDraggingUtils.jsm", {});
+ ChromeUtils.import("resource://gre/modules/WindowDraggingUtils.jsm");
new WindowDraggingElement(document.getElementById("titlebar"));
}
SessionStore.promiseInitialized.then(() => {
// Bail out if the window has been closed in the meantime.
if (window.closed) {
return;
}
diff --git browser/base/content/content-refreshblocker.js browser/base/content/content-refreshblocker.js
--- browser/base/content/content-refreshblocker.js
+++ browser/base/content/content-refreshblocker.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* eslint-env mozilla/frame-script */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var RefreshBlocker = {
PREF: "accessibility.blockautorefresh",
// Bug 1247100 - When a refresh is caused by an HTTP header,
// onRefreshAttempted will be fired before onLocationChange.
// When a refresh is caused by a <meta> tag in the document,
// onRefreshAttempted will be fired after onLocationChange.
diff --git browser/base/content/content.js browser/base/content/content.js
--- browser/base/content/content.js
+++ browser/base/content/content.js
@@ -4,17 +4,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* This content script should work in any browser or iframe and should not
* depend on the frame being contained in tabbrowser. */
/* eslint-env mozilla/frame-script */
/* eslint no-unused-vars: ["error", {args: "none"}] */
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
// TabChildGlobal
var global = this;
XPCOMUtils.defineLazyModuleGetters(this, {
ContentMetaHandler: "resource:///modules/ContentMetaHandler.jsm",
LoginFormFactory: "resource://gre/modules/LoginManagerContent.jsm",
InsecurePasswordUtils: "resource://gre/modules/InsecurePasswordUtils.jsm",
diff --git browser/base/content/nsContextMenu.js browser/base/content/nsContextMenu.js
--- browser/base/content/nsContextMenu.js
+++ browser/base/content/nsContextMenu.js
@@ -1,18 +1,18 @@
/* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ts=2 sw=2 sts=2 et tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
-ChromeUtils.import("resource://gre/modules/BrowserUtils.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {PrivateBrowsingUtils} = ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
+var {BrowserUtils} = ChromeUtils.import("resource://gre/modules/BrowserUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
SpellCheckHelper: "resource://gre/modules/InlineSpellChecker.jsm",
LoginHelper: "resource://gre/modules/LoginHelper.jsm",
LoginManagerContextMenu: "resource://gre/modules/LoginManagerContextMenu.jsm",
WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.jsm",
ContextualIdentityService: "resource://gre/modules/ContextualIdentityService.jsm",
DevToolsShim: "chrome://devtools-startup/content/DevToolsShim.jsm",
diff --git browser/base/content/pageinfo/pageInfo.js browser/base/content/pageinfo/pageInfo.js
--- browser/base/content/pageinfo/pageInfo.js
+++ browser/base/content/pageinfo/pageInfo.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
/* import-globals-from ../../../../toolkit/content/globalOverlay.js */
/* import-globals-from ../../../../toolkit/content/contentAreaUtils.js */
/* import-globals-from ../../../../toolkit/content/treeUtils.js */
/* import-globals-from ../utilityOverlay.js */
/* import-globals-from permissions.js */
/* import-globals-from security.js */
diff --git browser/base/content/pageinfo/permissions.js browser/base/content/pageinfo/permissions.js
--- browser/base/content/pageinfo/permissions.js
+++ browser/base/content/pageinfo/permissions.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* import-globals-from pageInfo.js */
-ChromeUtils.import("resource:///modules/SitePermissions.jsm");
+const {SitePermissions} = ChromeUtils.import("resource:///modules/SitePermissions.jsm");
ChromeUtils.import("resource://gre/modules/BrowserUtils.jsm");
var gPermURI;
var gPermPrincipal;
var gUsageRequest;
// Array of permissionIDs sorted alphabetically by label.
var gPermissions = SitePermissions.listPermissions()
diff --git browser/base/content/pageinfo/security.js browser/base/content/pageinfo/security.js
--- browser/base/content/pageinfo/security.js
+++ browser/base/content/pageinfo/security.js
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/BrowserUtils.jsm");
-ChromeUtils.import("resource:///modules/SiteDataManager.jsm");
-ChromeUtils.import("resource://gre/modules/DownloadUtils.jsm");
+const {SiteDataManager} = ChromeUtils.import("resource:///modules/SiteDataManager.jsm");
+const {DownloadUtils} = ChromeUtils.import("resource://gre/modules/DownloadUtils.jsm");
/* import-globals-from pageInfo.js */
ChromeUtils.defineModuleGetter(this, "LoginHelper",
"resource://gre/modules/LoginHelper.jsm");
ChromeUtils.defineModuleGetter(this, "PluralForm",
"resource://gre/modules/PluralForm.jsm");
diff --git browser/base/content/safeMode.js browser/base/content/safeMode.js
--- browser/base/content/safeMode.js
+++ browser/base/content/safeMode.js
@@ -1,18 +1,18 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const appStartup = Services.startup;
-ChromeUtils.import("resource://gre/modules/ResetProfile.jsm");
+const {ResetProfile} = ChromeUtils.import("resource://gre/modules/ResetProfile.jsm");
var defaultToReset = false;
function restartApp() {
appStartup.quit(appStartup.eForceQuit | appStartup.eRestart);
}
function resetProfile() {
diff --git browser/base/content/sanitizeDialog.js browser/base/content/sanitizeDialog.js
--- browser/base/content/sanitizeDialog.js
+++ browser/base/content/sanitizeDialog.js
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* import-globals-from ../../../toolkit/content/preferencesBindings.js */
-var {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm", {});
+var {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm");
Preferences.addAll([
{ id: "privacy.cpd.history", type: "bool" },
{ id: "privacy.cpd.formdata", type: "bool" },
{ id: "privacy.cpd.downloads", type: "bool", disabled: true },
{ id: "privacy.cpd.cookies", type: "bool" },
{ id: "privacy.cpd.cache", type: "bool" },
{ id: "privacy.cpd.sessions", type: "bool" },
diff --git browser/base/content/tab-content.js browser/base/content/tab-content.js
--- browser/base/content/tab-content.js
+++ browser/base/content/tab-content.js
@@ -3,34 +3,34 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* This content script contains code that requires a tab browser. */
/* eslint-env mozilla/frame-script */
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "E10SUtils",
"resource://gre/modules/E10SUtils.jsm");
ChromeUtils.defineModuleGetter(this, "BrowserUtils",
"resource://gre/modules/BrowserUtils.jsm");
-ChromeUtils.import("resource://gre/modules/ActorManagerChild.jsm");
+var {ActorManagerChild} = ChromeUtils.import("resource://gre/modules/ActorManagerChild.jsm");
ActorManagerChild.attach(this, "browsers");
// TabChildGlobal
var global = this;
// Keep a reference to the translation content handler to avoid it it being GC'ed.
var trHandler = null;
if (Services.prefs.getBoolPref("browser.translation.detectLanguage")) {
- ChromeUtils.import("resource:///modules/translation/TranslationContentHandler.jsm");
+ var {TranslationContentHandler} = ChromeUtils.import("resource:///modules/translation/TranslationContentHandler.jsm");
trHandler = new TranslationContentHandler(global, docShell);
}
var WebBrowserChrome = {
onBeforeLinkTraversal(originalTarget, linkURI, linkNode, isAppTab) {
return BrowserUtils.onBeforeLinkTraversal(originalTarget, linkURI, linkNode, isAppTab);
},
diff --git browser/base/content/test/about/browser_aboutCertError.js browser/base/content/test/about/browser_aboutCertError.js
--- browser/base/content/test/about/browser_aboutCertError.js
+++ browser/base/content/test/about/browser_aboutCertError.js
@@ -5,17 +5,17 @@
// This is testing the aboutCertError page (Bug 1207107).
const GOOD_PAGE = "https://example.com/";
const GOOD_PAGE_2 = "https://example.org/";
const BAD_CERT = "https://expired.example.com/";
const UNKNOWN_ISSUER = "https://self-signed.example.com ";
const BAD_STS_CERT = "https://badchain.include-subdomains.pinning.example.com:443";
-const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
+const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm");
const PREF_NEW_CERT_ERRORS = "browser.security.newcerterrorpage.enabled";
add_task(async function checkReturnToAboutHome() {
info("Loading a bad cert page directly and making sure 'return to previous page' goes to about:home");
for (let useFrame of [false, true]) {
let tab = await openErrorPage(BAD_CERT, useFrame);
let browser = tab.linkedBrowser;
diff --git browser/base/content/test/about/head.js browser/base/content/test/about/head.js
--- browser/base/content/test/about/head.js
+++ browser/base/content/test/about/head.js
@@ -116,17 +116,17 @@ function promiseTabLoadEvent(tab, url) {
* However, the browser UI will behave differently for loads stopped directly from
* the progress listener (effectively in the middle of a call to loadURI) and so there
* are cases where you may want to avoid stopping the load directly from within the
* progress listener callback.
* @return promise
*/
function waitForDocLoadAndStopIt(aExpectedURL, aBrowser = gBrowser.selectedBrowser, aStopFromProgressListener = true) {
function content_script(contentStopFromProgressListener) {
- ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+ const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
let wp = docShell.QueryInterface(Ci.nsIWebProgress);
function stopContent(now, uri) {
if (now) {
/* Hammer time. */
content.stop();
/* Let the parent know we're done. */
diff --git browser/base/content/test/alerts/browser_notification_close.js browser/base/content/test/alerts/browser_notification_close.js
--- browser/base/content/test/alerts/browser_notification_close.js
+++ browser/base/content/test/alerts/browser_notification_close.js
@@ -1,12 +1,12 @@
"use strict";
const {PlacesTestUtils} =
- ChromeUtils.import("resource://testing-common/PlacesTestUtils.jsm", {});
+ ChromeUtils.import("resource://testing-common/PlacesTestUtils.jsm");
let notificationURL = "http://example.org/browser/browser/base/content/test/alerts/file_dom_notifications.html";
let oldShowFavicons;
add_task(async function test_notificationClose() {
let notificationURI = makeURI(notificationURL);
await addNotificationPermission(notificationURL);
diff --git browser/base/content/test/captivePortal/head.js browser/base/content/test/captivePortal/head.js
--- browser/base/content/test/captivePortal/head.js
+++ browser/base/content/test/captivePortal/head.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource:///modules/BrowserWindowTracker.jsm");
+var {BrowserWindowTracker} = ChromeUtils.import("resource:///modules/BrowserWindowTracker.jsm");
ChromeUtils.defineModuleGetter(this, "CaptivePortalWatcher",
"resource:///modules/CaptivePortalWatcher.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "cps",
"@mozilla.org/network/captive-portal-service;1",
"nsICaptivePortalService");
diff --git browser/base/content/test/chrome/test_aboutCrashed.xul browser/base/content/test/chrome/test_aboutCrashed.xul
--- browser/base/content/test/chrome/test_aboutCrashed.xul
+++ browser/base/content/test/chrome/test_aboutCrashed.xul
@@ -7,17 +7,17 @@
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
<iframe type="content" id="frame1"/>
<iframe type="content" id="frame2" onload="doTest()"/>
<script type="application/javascript"><![CDATA[
- ChromeUtils.import("resource://gre/modules/Services.jsm");
+ const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
SimpleTest.waitForExplicitFinish();
// Load error pages do not fire "load" events, so let's use a progressListener.
function waitForErrorPage(frame) {
return new Promise(resolve => {
let progressListener = {
diff --git browser/base/content/test/chrome/test_aboutRestartRequired.xul browser/base/content/test/chrome/test_aboutRestartRequired.xul
--- browser/base/content/test/chrome/test_aboutRestartRequired.xul
+++ browser/base/content/test/chrome/test_aboutRestartRequired.xul
@@ -7,17 +7,17 @@
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
<iframe type="content" id="frame1"/>
<iframe type="content" id="frame2" onload="doTest()"/>
<script type="application/javascript"><![CDATA[
- ChromeUtils.import("resource://gre/modules/Services.jsm");
+ const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
SimpleTest.waitForExplicitFinish();
// Load error pages do not fire "load" events, so let's use a progressListener.
function waitForErrorPage(frame) {
return new Promise(resolve => {
let progressListener = {
onLocationChange: function(aWebProgress, aRequest, aLocation, aFlags) {
diff --git browser/base/content/test/favicons/head.js browser/base/content/test/favicons/head.js
--- browser/base/content/test/favicons/head.js
+++ browser/base/content/test/favicons/head.js
@@ -1,12 +1,12 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
// Clear the network cache between every test to make sure we get a stable state
Services.cache2.clear();
function waitForFaviconMessage(isTabIcon = undefined, expectedURL = undefined) {
diff --git browser/base/content/test/forms/head.js browser/base/content/test/forms/head.js
--- browser/base/content/test/forms/head.js
+++ browser/base/content/test/forms/head.js
@@ -1,13 +1,13 @@
function hideSelectPopup(selectPopup, mode = "enter", win = window) {
let browser = win.gBrowser.selectedBrowser;
let selectClosedPromise = ContentTask.spawn(browser, null, async function() {
let {SelectContentHelper} =
- ChromeUtils.import("resource://gre/actors/SelectChild.jsm", {});
+ ChromeUtils.import("resource://gre/actors/SelectChild.jsm", null);
return ContentTaskUtils.waitForCondition(() => !SelectContentHelper.open);
});
if (mode == "escape") {
EventUtils.synthesizeKey("KEY_Escape", {}, win);
} else if (mode == "enter") {
EventUtils.synthesizeKey("KEY_Enter", {}, win);
} else if (mode == "click") {
diff --git browser/base/content/test/general/browser_blob-channelname.js browser/base/content/test/general/browser_blob-channelname.js
--- browser/base/content/test/general/browser_blob-channelname.js
+++ browser/base/content/test/general/browser_blob-channelname.js
@@ -1,11 +1,11 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
function test() {
var file = new File([new Blob(["test"], {type: "text/plain"})], "test-name");
var url = URL.createObjectURL(file);
var channel = NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true});
is(channel.contentDispositionFilename, "test-name", "filename matches");
}
diff --git browser/base/content/test/general/browser_compacttheme.js browser/base/content/test/general/browser_compacttheme.js
--- browser/base/content/test/general/browser_compacttheme.js
+++ browser/base/content/test/general/browser_compacttheme.js
@@ -3,17 +3,17 @@
* A special stylesheet should be added to the browser.xul document
* when the firefox-compact-light and firefox-compact-dark lightweight
* themes are applied.
*/
const PREF_LWTHEME_USED_THEMES = "lightweightThemes.usedThemes";
const COMPACT_LIGHT_ID = "firefox-compact-light@mozilla.org";
const COMPACT_DARK_ID = "firefox-compact-dark@mozilla.org";
-const {LightweightThemeManager} = ChromeUtils.import("resource://gre/modules/LightweightThemeManager.jsm", {});
+const {LightweightThemeManager} = ChromeUtils.import("resource://gre/modules/LightweightThemeManager.jsm");
registerCleanupFunction(() => {
// Set preferences back to their original values
LightweightThemeManager.currentTheme = null;
Services.prefs.clearUserPref(PREF_LWTHEME_USED_THEMES);
});
function tick() {
diff --git browser/base/content/test/general/browser_contentSearchUI.js browser/base/content/test/general/browser_contentSearchUI.js
--- browser/base/content/test/general/browser_contentSearchUI.js
+++ browser/base/content/test/general/browser_contentSearchUI.js
@@ -4,18 +4,17 @@
const TEST_PAGE_BASENAME = "contentSearchUI.html";
const TEST_CONTENT_SCRIPT_BASENAME = "contentSearchUI.js";
const TEST_ENGINE_PREFIX = "browser_searchSuggestionEngine";
const TEST_ENGINE_BASENAME = "searchSuggestionEngine.xml";
const TEST_ENGINE_2_BASENAME = "searchSuggestionEngine2.xml";
const TEST_MSG = "ContentSearchUIControllerTest";
-let {SearchTestUtils} = ChromeUtils.import(
- "resource://testing-common/SearchTestUtils.jsm", {});
+let {SearchTestUtils} = ChromeUtils.import("resource://testing-common/SearchTestUtils.jsm");
SearchTestUtils.init(Assert, registerCleanupFunction);
requestLongerTimeout(2);
add_task(async function emptyInput() {
await setUp();
@@ -628,17 +627,17 @@ add_task(async function settings() {
await msg("reset");
});
var gDidInitialSetUp = false;
function setUp(aNoEngine) {
return (async function() {
if (!gDidInitialSetUp) {
- ChromeUtils.import("resource:///modules/ContentSearch.jsm");
+ var {ContentSearch} = ChromeUtils.import("resource:///modules/ContentSearch.jsm");
let originalOnMessageSearch = ContentSearch._onMessageSearch;
let originalOnMessageManageEngines = ContentSearch._onMessageManageEngines;
ContentSearch._onMessageSearch = () => {};
ContentSearch._onMessageManageEngines = () => {};
registerCleanupFunction(() => {
ContentSearch._onMessageSearch = originalOnMessageSearch;
ContentSearch._onMessageManageEngines = originalOnMessageManageEngines;
});
diff --git browser/base/content/test/general/browser_fullscreen-window-open.js browser/base/content/test/general/browser_fullscreen-window-open.js
--- browser/base/content/test/general/browser_fullscreen-window-open.js
+++ browser/base/content/test/general/browser_fullscreen-window-open.js
@@ -1,11 +1,11 @@
/* eslint-disable mozilla/no-arbitrary-setTimeout */
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const PREF_DISABLE_OPEN_NEW_WINDOW = "browser.link.open_newwindow.disabled_in_fullscreen";
const PREF_BLOCK_TOPLEVEL_DATA = "security.data_uri.block_toplevel_data_uri_navigations";
const isOSX = (Services.appinfo.OS === "Darwin");
const TEST_FILE = "file_fullscreen-window-open.html";
const gHttpTestRoot = getRootDirectory(gTestPath).replace("chrome://mochitests/content/",
"http://127.0.0.1:8888/");
diff --git browser/base/content/test/general/browser_gZipOfflineChild.js browser/base/content/test/general/browser_gZipOfflineChild.js
--- browser/base/content/test/general/browser_gZipOfflineChild.js
+++ browser/base/content/test/general/browser_gZipOfflineChild.js
@@ -13,17 +13,17 @@ registerCleanupFunction(function() {
Services.prefs.clearUserPref("offline-apps.allow_by_default");
});
//
// Handle "message" events which are posted from the iframe upon
// offline cache events.
//
function contentTask() {
- ChromeUtils.import("resource://gre/modules/Timer.jsm");
+ const {clearInterval, setInterval} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
let resolve;
let promise = new Promise(r => { resolve = r; });
var cacheCount = 0;
var intervalID = 0;
function handleMessageEvents(event) {
diff --git browser/base/content/test/general/browser_newWindowDrop.js browser/base/content/test/general/browser_newWindowDrop.js
--- browser/base/content/test/general/browser_newWindowDrop.js
+++ browser/base/content/test/general/browser_newWindowDrop.js
@@ -12,17 +12,17 @@ add_task(async function test_setup() {
// Stop search-engine loads from hitting the network
Services.search.addEngineWithDetails("MozSearch", "", "", "", "GET",
"http://example.com/?q={searchTerms}");
let engine = Services.search.getEngineByName("MozSearch");
originalEngine = Services.search.defaultEngine;
Services.search.defaultEngine = engine;
// Move New Window button to nav bar, to make it possible to drag and drop.
- let {CustomizableUI} = ChromeUtils.import("resource:///modules/CustomizableUI.jsm", {});
+ let {CustomizableUI} = ChromeUtils.import("resource:///modules/CustomizableUI.jsm");
let origPlacement = CustomizableUI.getPlacementOfWidget("new-window-button");
if (!origPlacement || origPlacement.area != CustomizableUI.AREA_NAVBAR) {
CustomizableUI.addWidgetToArea("new-window-button",
CustomizableUI.AREA_NAVBAR,
0);
CustomizableUI.ensureWidgetPlacedInWindow("new-window-button", window);
registerCleanupFunction(function() {
CustomizableUI.removeWidgetFromArea("new-window-button");
diff --git browser/base/content/test/general/browser_offlineQuotaNotification.js browser/base/content/test/general/browser_offlineQuotaNotification.js
--- browser/base/content/test/general/browser_offlineQuotaNotification.js
+++ browser/base/content/test/general/browser_offlineQuotaNotification.js
@@ -10,17 +10,17 @@ const URL = "http://mochi.test:8888/brow
registerCleanupFunction(function() {
// Clean up after ourself
let uri = Services.io.newURI(URL);
let principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, {});
Services.perms.removeFromPrincipal(principal, "offline-app");
Services.prefs.clearUserPref("offline-apps.quota.warn");
Services.prefs.clearUserPref("offline-apps.allow_by_default");
- let {OfflineAppCacheHelper} = ChromeUtils.import("resource://gre/modules/offlineAppCache.jsm", {});
+ let {OfflineAppCacheHelper} = ChromeUtils.import("resource://gre/modules/offlineAppCache.jsm");
OfflineAppCacheHelper.clear();
});
// Same as the other one, but for in-content preferences
function checkInContentPreferences(win) {
let doc = win.document;
let sel = doc.getElementById("categories").selectedItems[0].id;
is(gBrowser.currentURI.spec, "about:preferences#privacy", "about:preferences loaded");
diff --git browser/base/content/test/general/browser_remoteTroubleshoot.js browser/base/content/test/general/browser_remoteTroubleshoot.js
--- browser/base/content/test/general/browser_remoteTroubleshoot.js
+++ browser/base/content/test/general/browser_remoteTroubleshoot.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-var {WebChannel} = ChromeUtils.import("resource://gre/modules/WebChannel.jsm", {});
+var {WebChannel} = ChromeUtils.import("resource://gre/modules/WebChannel.jsm");
const TEST_URL_TAIL = "example.com/browser/browser/base/content/test/general/test_remoteTroubleshoot.html";
const TEST_URI_GOOD = Services.io.newURI("https://" + TEST_URL_TAIL);
const TEST_URI_BAD = Services.io.newURI("http://" + TEST_URL_TAIL);
const TEST_URI_GOOD_OBJECT = Services.io.newURI("https://" + TEST_URL_TAIL + "?object");
// Creates a one-shot web-channel for the test data to be sent back from the test page.
function promiseChannelResponse(channelID, originOrPermission) {
diff --git browser/base/content/test/general/browser_restore_isAppTab.js browser/base/content/test/general/browser_restore_isAppTab.js
--- browser/base/content/test/general/browser_restore_isAppTab.js
+++ browser/base/content/test/general/browser_restore_isAppTab.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
/* eslint-env mozilla/frame-script */
-const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
+const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm");
const DUMMY = "http://example.com/browser/browser/base/content/test/general/dummy_page.html";
function frameScript() {
addMessageListener("Test:GetIsAppTab", function() {
sendAsyncMessage("Test:IsAppTab", { isAppTab: docShell.isAppTab });
});
}
diff --git browser/base/content/test/general/browser_tab_detach_restore.js browser/base/content/test/general/browser_tab_detach_restore.js
--- browser/base/content/test/general/browser_tab_detach_restore.js
+++ browser/base/content/test/general/browser_tab_detach_restore.js
@@ -1,11 +1,11 @@
"use strict";
-const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
+const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm");
add_task(async function() {
let uri = "http://example.com/browser/browser/base/content/test/general/dummy_page.html";
// Clear out the closed windows set to start
while (SessionStore.getClosedWindowCount() > 0)
SessionStore.forgetClosedWindow(0);
diff --git browser/base/content/test/general/browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js browser/base/content/test/general/browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js
--- browser/base/content/test/general/browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js
+++ browser/base/content/test/general/browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
const OPEN_LOCATION_PREF = "browser.link.open_newwindow";
const NON_REMOTE_PAGE = "about:welcomeback";
-ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
+const {PrivateBrowsingUtils} = ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
requestLongerTimeout(2);
function frame_script() {
content.document.body.innerHTML = `
<a href="http://example.com/" target="_blank" rel="opener" id="testAnchor">Open a window</a>
`;
diff --git browser/base/content/test/general/browser_web_channel.js browser/base/content/test/general/browser_web_channel.js
--- browser/base/content/test/general/browser_web_channel.js
+++ browser/base/content/test/general/browser_web_channel.js
@@ -1,13 +1,13 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "WebChannel",
"resource://gre/modules/WebChannel.jsm");
const HTTP_PATH = "http://example.com";
const HTTP_ENDPOINT = "/browser/browser/base/content/test/general/browser_web_channel.html";
const HTTP_MISMATCH_PATH = "http://example.org";
const HTTP_IFRAME_PATH = "http://mochi.test:8888";
const HTTP_REDIRECTED_IFRAME_PATH = "http://example.org";
diff --git browser/base/content/test/general/contextmenu_common.js browser/base/content/test/general/contextmenu_common.js
--- browser/base/content/test/general/contextmenu_common.js
+++ browser/base/content/test/general/contextmenu_common.js
@@ -285,18 +285,17 @@ async function test_contextmenu(selector
await options.preCheckContextMenuFn();
info("Completed preCheckContextMenuFn");
}
if (options.waitForSpellCheck) {
info("Waiting for spell check");
await ContentTask.spawn(gBrowser.selectedBrowser, selector, async function(contentSelector) {
let {onSpellCheck} =
- ChromeUtils.import("resource://testing-common/AsyncSpellCheckTestHelper.jsm",
- {});
+ ChromeUtils.import("resource://testing-common/AsyncSpellCheckTestHelper.jsm");
let element = content.document.querySelector(contentSelector);
await new Promise(resolve => onSpellCheck(element, resolve));
info("Spell check running");
});
}
let awaitPopupShown = BrowserTestUtils.waitForEvent(contextMenu, "popupshown");
await BrowserTestUtils.synthesizeMouse(selector, options.offsetX || 0, options.offsetY || 0, {
diff --git browser/base/content/test/metaTags/head.js browser/base/content/test/metaTags/head.js
--- browser/base/content/test/metaTags/head.js
+++ browser/base/content/test/metaTags/head.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesTestUtils",
"resource://testing-common/PlacesTestUtils.jsm");
/**
* Wait for url's page info (non-null description and preview url) to be set.
diff --git browser/base/content/test/pageinfo/browser_pageinfo_permissions.js browser/base/content/test/pageinfo/browser_pageinfo_permissions.js
--- browser/base/content/test/pageinfo/browser_pageinfo_permissions.js
+++ browser/base/content/test/pageinfo/browser_pageinfo_permissions.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource:///modules/SitePermissions.jsm");
+const {SitePermissions} = ChromeUtils.import("resource:///modules/SitePermissions.jsm");
const TEST_ORIGIN = "https://example.com";
async function testPermissions(defaultPermission) {
await BrowserTestUtils.withNewTab(TEST_ORIGIN, async function(browser) {
let pageInfo = BrowserPageInfo(TEST_ORIGIN, "permTab");
await BrowserTestUtils.waitForEvent(pageInfo, "load");
diff --git browser/base/content/test/performance/browser_startup_content.js browser/base/content/test/performance/browser_startup_content.js
--- browser/base/content/test/performance/browser_startup_content.js
+++ browser/base/content/test/performance/browser_startup_content.js
@@ -99,17 +99,17 @@ add_task(async function() {
let mm = gBrowser.selectedBrowser.messageManager;
let promise = BrowserTestUtils.waitForMessage(mm, "Test:LoadedScripts");
// Load a custom frame script to avoid using ContentTask which loads Task.jsm
mm.loadFrameScript("data:text/javascript,(" + function() {
/* eslint-env mozilla/frame-script */
const Cm = Components.manager;
Cm.QueryInterface(Ci.nsIServiceManager);
- ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+ const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
let collectStacks = AppConstants.NIGHTLY_BUILD || AppConstants.DEBUG;
let components = {};
for (let component of Cu.loadedComponents) {
/* Keep only the file name for components, as the path is an absolute file
URL rather than a resource:// URL like for modules. */
components[component.replace(/.*\//, "")] =
collectStacks ? Cu.getComponentLoadStack(component) : "";
}
diff --git browser/base/content/test/permissions/browser_temporary_permissions.js browser/base/content/test/permissions/browser_temporary_permissions.js
--- browser/base/content/test/permissions/browser_temporary_permissions.js
+++ browser/base/content/test/permissions/browser_temporary_permissions.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-ChromeUtils.import("resource://gre/modules/E10SUtils.jsm");
+const {E10SUtils} = ChromeUtils.import("resource://gre/modules/E10SUtils.jsm");
const ORIGIN = "https://example.com";
const PERMISSIONS_PAGE = getRootDirectory(gTestPath).replace("chrome://mochitests/content", ORIGIN) + "permissions.html";
const SUBFRAME_PAGE = getRootDirectory(gTestPath).replace("chrome://mochitests/content", ORIGIN) + "temporary_permissions_subframe.html";
// Test that setting temp permissions triggers a change in the identity block.
add_task(async function testTempPermissionChangeEvents() {
let uri = NetUtil.newURI(ORIGIN);
diff --git browser/base/content/test/permissions/browser_temporary_permissions_expiry.js browser/base/content/test/permissions/browser_temporary_permissions_expiry.js
--- browser/base/content/test/permissions/browser_temporary_permissions_expiry.js
+++ browser/base/content/test/permissions/browser_temporary_permissions_expiry.js
@@ -3,17 +3,17 @@
/* eslint-disable mozilla/no-arbitrary-setTimeout */
"use strict";
const ORIGIN = "https://example.com";
const PERMISSIONS_PAGE = getRootDirectory(gTestPath).replace("chrome://mochitests/content", ORIGIN) + "permissions.html";
// Ignore promise rejection caused by clicking Deny button.
-const { PromiseTestUtils } = ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", {});
+const { PromiseTestUtils } = ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm");
PromiseTestUtils.whitelistRejectionsGlobally(/The request is not allowed/);
const EXPIRE_TIME_MS = 100;
const TIMEOUT_MS = 500;
// Test that temporary permissions can be re-requested after they expired
// and that the identity block is updated accordingly.
add_task(async function testTempPermissionRequestAfterExpiry() {
diff --git browser/base/content/test/plugins/blocklist_proxy.js browser/base/content/test/plugins/blocklist_proxy.js
--- browser/base/content/test/plugins/blocklist_proxy.js
+++ browser/base/content/test/plugins/blocklist_proxy.js
@@ -1,16 +1,16 @@
var Cm = Components.manager;
const kBlocklistServiceUUID = "{66354bc9-7ed1-4692-ae1d-8da97d6b205e}";
const kBlocklistServiceContractID = "@mozilla.org/extensions/blocklist;1";
const kBlocklistServiceFactory = Cm.getClassObject(Cc[kBlocklistServiceContractID], Ci.nsIFactory);
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
+const {setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
SimpleTest.requestFlakyTimeout("Need to simulate blocklist calls actually taking non-0 time to return");
/*
* A lightweight blocklist proxy for the testing purposes.
*/
var BlocklistProxy = {
_uuid: null,
diff --git browser/base/content/test/plugins/browser_clearplugindata.js browser/base/content/test/plugins/browser_clearplugindata.js
--- browser/base/content/test/plugins/browser_clearplugindata.js
+++ browser/base/content/test/plugins/browser_clearplugindata.js
@@ -1,17 +1,17 @@
var gTestRoot = getRootDirectory(gTestPath).replace("chrome://mochitests/content/", "http://127.0.0.1:8888/");
var gPluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
var gTestBrowser = null;
// Test clearing plugin data using Sanitizer.jsm.
const testURL1 = gTestRoot + "browser_clearplugindata.html";
const testURL2 = gTestRoot + "browser_clearplugindata_noage.html";
-const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm", {});
+const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm");
const pluginHostIface = Ci.nsIPluginHost;
var pluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
pluginHost.QueryInterface(pluginHostIface);
var pluginTag = getTestPlugin();
function stored(needles) {
diff --git browser/base/content/test/plugins/browser_pluginCrashReportNonDeterminism.js browser/base/content/test/plugins/browser_pluginCrashReportNonDeterminism.js
--- browser/base/content/test/plugins/browser_pluginCrashReportNonDeterminism.js
+++ browser/base/content/test/plugins/browser_pluginCrashReportNonDeterminism.js
@@ -1,12 +1,12 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
-ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
+const {PromiseUtils} = ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
/**
* With e10s, plugins must run in their own process. This means we have
* three processes at a minimum when we're running a plugin:
*
* 1) The main browser, or "chrome" process
* 2) The content process hosting the plugin instance
* 3) The plugin process
diff --git browser/base/content/test/plugins/browser_private_clicktoplay.js browser/base/content/test/plugins/browser_private_clicktoplay.js
--- browser/base/content/test/plugins/browser_private_clicktoplay.js
+++ browser/base/content/test/plugins/browser_private_clicktoplay.js
@@ -1,17 +1,17 @@
var rootDir = getRootDirectory(gTestPath);
const gTestRoot = rootDir;
const gHttpTestRoot = rootDir.replace("chrome://mochitests/content/", "http://127.0.0.1:8888/");
var gTestBrowser = null;
var gNextTest = null;
var gPluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var gPrivateWindow = null;
var gPrivateBrowser = null;
function finishTest() {
clearAllPluginPermissions();
gBrowser.removeCurrentTab();
if (gPrivateWindow) {
diff --git browser/base/content/test/plugins/head.js browser/base/content/test/plugins/head.js
--- browser/base/content/test/plugins/head.js
+++ browser/base/content/test/plugins/head.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PromiseUtils",
"resource://gre/modules/PromiseUtils.jsm");
// Various tests in this directory may define gTestBrowser, to use as the
// default browser under test in some of the functions below.
diff --git browser/base/content/test/plugins/xbl/blocklist_proxy.js browser/base/content/test/plugins/xbl/blocklist_proxy.js
--- browser/base/content/test/plugins/xbl/blocklist_proxy.js
+++ browser/base/content/test/plugins/xbl/blocklist_proxy.js
@@ -1,16 +1,16 @@
var Cm = Components.manager;
const kBlocklistServiceUUID = "{66354bc9-7ed1-4692-ae1d-8da97d6b205e}";
const kBlocklistServiceContractID = "@mozilla.org/extensions/blocklist;1";
const kBlocklistServiceFactory = Cm.getClassObject(Cc[kBlocklistServiceContractID], Ci.nsIFactory);
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
+const {setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
SimpleTest.requestFlakyTimeout("Need to simulate blocklist calls actually taking non-0 time to return");
/*
* A lightweight blocklist proxy for the testing purposes.
*/
var BlocklistProxy = {
_uuid: null,
diff --git browser/base/content/test/plugins/xbl/browser_clearplugindata.js browser/base/content/test/plugins/xbl/browser_clearplugindata.js
--- browser/base/content/test/plugins/xbl/browser_clearplugindata.js
+++ browser/base/content/test/plugins/xbl/browser_clearplugindata.js
@@ -3,17 +3,17 @@
var gTestRoot = getRootDirectory(gTestPath).replace("chrome://mochitests/content/", "http://127.0.0.1:8888/");
var gPluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
var gTestBrowser = null;
// Test clearing plugin data using Sanitizer.jsm.
const testURL1 = gTestRoot + "browser_clearplugindata.html";
const testURL2 = gTestRoot + "browser_clearplugindata_noage.html";
-const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm", {});
+const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm");
const pluginHostIface = Ci.nsIPluginHost;
var pluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
pluginHost.QueryInterface(pluginHostIface);
var pluginTag = getTestPlugin();
function stored(needles) {
diff --git browser/base/content/test/plugins/xbl/browser_pluginCrashReportNonDeterminism.js browser/base/content/test/plugins/xbl/browser_pluginCrashReportNonDeterminism.js
--- browser/base/content/test/plugins/xbl/browser_pluginCrashReportNonDeterminism.js
+++ browser/base/content/test/plugins/xbl/browser_pluginCrashReportNonDeterminism.js
@@ -1,14 +1,14 @@
/* import-globals-from ../head.js */
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
-ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
+const {PromiseUtils} = ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
/**
* With e10s, plugins must run in their own process. This means we have
* three processes at a minimum when we're running a plugin:
*
* 1) The main browser, or "chrome" process
* 2) The content process hosting the plugin instance
* 3) The plugin process
diff --git browser/base/content/test/plugins/xbl/browser_private_clicktoplay.js browser/base/content/test/plugins/xbl/browser_private_clicktoplay.js
--- browser/base/content/test/plugins/xbl/browser_private_clicktoplay.js
+++ browser/base/content/test/plugins/xbl/browser_private_clicktoplay.js
@@ -3,17 +3,17 @@
var rootDir = getRootDirectory(gTestPath);
const gTestRoot = rootDir;
const gHttpTestRoot = rootDir.replace("chrome://mochitests/content/", "http://127.0.0.1:8888/");
var gTestBrowser = null;
var gNextTest = null;
var gPluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var gPrivateWindow = null;
var gPrivateBrowser = null;
function finishTest() {
clearAllPluginPermissions();
gBrowser.removeCurrentTab();
if (gPrivateWindow) {
diff --git browser/base/content/test/popupNotifications/head.js browser/base/content/test/popupNotifications/head.js
--- browser/base/content/test/popupNotifications/head.js
+++ browser/base/content/test/popupNotifications/head.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
/**
* Called after opening a new window or switching windows, this will wait until
* we are sure that an attempt to display a notification will not fail.
*/
diff --git browser/base/content/test/popups/browser_popup_blocker_identity_block.js browser/base/content/test/popups/browser_popup_blocker_identity_block.js
--- browser/base/content/test/popups/browser_popup_blocker_identity_block.js
+++ browser/base/content/test/popups/browser_popup_blocker_identity_block.js
@@ -1,16 +1,16 @@
"use strict";
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource:///modules/SitePermissions.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {SitePermissions} = ChromeUtils.import("resource:///modules/SitePermissions.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const baseURL = getRootDirectory(gTestPath).replace("chrome://mochitests/content", "http://example.com");
const URL = baseURL + "popup_blocker2.html";
const URI = Services.io.newURI(URL);
function openIdentityPopup() {
let promise = BrowserTestUtils.waitForEvent(gIdentityHandler._identityPopup, "popupshown");
gIdentityHandler._identityBox.click();
diff --git browser/base/content/test/referrer/head.js browser/base/content/test/referrer/head.js
--- browser/base/content/test/referrer/head.js
+++ browser/base/content/test/referrer/head.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "BrowserTestUtils",
"resource://testing-common/BrowserTestUtils.jsm");
ChromeUtils.defineModuleGetter(this, "ContentTask",
"resource://testing-common/ContentTask.jsm");
const REFERRER_URL_BASE = "/browser/browser/base/content/test/referrer/";
const REFERRER_POLICYSERVER_URL =
diff --git browser/base/content/test/sanitize/SiteDataTestUtils.jsm browser/base/content/test/sanitize/SiteDataTestUtils.jsm
--- browser/base/content/test/sanitize/SiteDataTestUtils.jsm
+++ browser/base/content/test/sanitize/SiteDataTestUtils.jsm
@@ -1,20 +1,20 @@
"use strict";
var EXPORTED_SYMBOLS = [
"SiteDataTestUtils",
];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://testing-common/ContentTask.jsm");
-ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {ContentTask} = ChromeUtils.import("resource://testing-common/ContentTask.jsm");
+const {BrowserTestUtils} = ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
-const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm", {});
+const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "swm",
"@mozilla.org/serviceworkers/manager;1",
"nsIServiceWorkerManager");
/**
* This module assists with tasks around testing functionality that shows
* or clears site data.
diff --git browser/base/content/test/sanitize/browser_cookiePermission.js browser/base/content/test/sanitize/browser_cookiePermission.js
--- browser/base/content/test/sanitize/browser_cookiePermission.js
+++ browser/base/content/test/sanitize/browser_cookiePermission.js
@@ -1,11 +1,11 @@
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm", {});
-const {SiteDataTestUtils} = ChromeUtils.import("resource://testing-common/SiteDataTestUtils.jsm", {});
+const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm");
+const {SiteDataTestUtils} = ChromeUtils.import("resource://testing-common/SiteDataTestUtils.jsm");
function checkDataForAboutURL() {
return new Promise(resolve => {
let data = true;
let uri = Services.io.newURI("about:newtab");
let principal =
Services.scriptSecurityManager.createCodebasePrincipal(uri, {});
let request = indexedDB.openForPrincipal(principal, "TestDatabase", 1);
diff --git browser/base/content/test/sanitize/browser_sanitize-offlineData.js browser/base/content/test/sanitize/browser_sanitize-offlineData.js
--- browser/base/content/test/sanitize/browser_sanitize-offlineData.js
+++ browser/base/content/test/sanitize/browser_sanitize-offlineData.js
@@ -1,14 +1,14 @@
// Bug 380852 - Delete permission manager entries in Clear Recent History
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm", {});
-const {SiteDataTestUtils} = ChromeUtils.import("resource://testing-common/SiteDataTestUtils.jsm", {});
-const {PromiseTestUtils} = ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", {});
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm");
+const {SiteDataTestUtils} = ChromeUtils.import("resource://testing-common/SiteDataTestUtils.jsm");
+const {PromiseTestUtils} = ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "sas",
"@mozilla.org/storage/activity-service;1",
"nsIStorageActivityService");
XPCOMUtils.defineLazyServiceGetter(this, "swm",
"@mozilla.org/serviceworkers/manager;1",
"nsIServiceWorkerManager");
diff --git browser/base/content/test/sanitize/browser_sanitize-timespans.js browser/base/content/test/sanitize/browser_sanitize-timespans.js
--- browser/base/content/test/sanitize/browser_sanitize-timespans.js
+++ browser/base/content/test/sanitize/browser_sanitize-timespans.js
@@ -1,12 +1,12 @@
requestLongerTimeout(2);
const {PlacesTestUtils} =
- ChromeUtils.import("resource://testing-common/PlacesTestUtils.jsm", {});
+ ChromeUtils.import("resource://testing-common/PlacesTestUtils.jsm");
// Bug 453440 - Test the timespan-based logic of the sanitizer code
var now_mSec = Date.now();
var now_uSec = now_mSec * 1000;
const kMsecPerMin = 60 * 1000;
const kUsecPerMin = 60 * 1000000;
diff --git browser/base/content/test/sanitize/head.js browser/base/content/test/sanitize/head.js
--- browser/base/content/test/sanitize/head.js
+++ browser/base/content/test/sanitize/head.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
Downloads: "resource://gre/modules/Downloads.jsm",
FormHistory: "resource://gre/modules/FormHistory.jsm",
PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
Sanitizer: "resource:///modules/Sanitizer.jsm",
});
diff --git browser/base/content/test/siteIdentity/browser_secure_transport_insecure_scheme.js browser/base/content/test/siteIdentity/browser_secure_transport_insecure_scheme.js
--- browser/base/content/test/siteIdentity/browser_secure_transport_insecure_scheme.js
+++ browser/base/content/test/siteIdentity/browser_secure_transport_insecure_scheme.js
@@ -108,17 +108,17 @@ add_task(async function() {
mainThreadOnly: true,
PACURI: null,
getProxyForURI: (aSpec, aScheme, aHost, aPort) => {
return `HTTPS localhost:${server.port}`;
},
};
let oldProxyType = Services.prefs.getIntPref("network.proxy.type");
Services.prefs.setIntPref("network.proxy.type", Ci.nsIProtocolProxyService.PROXYCONFIG_SYSTEM);
- let { MockRegistrar } = ChromeUtils.import("resource://testing-common/MockRegistrar.jsm", {});
+ let { MockRegistrar } = ChromeUtils.import("resource://testing-common/MockRegistrar.jsm");
let mockProxy = MockRegistrar.register("@mozilla.org/system-proxy-settings;1",
systemProxySettings);
// Register cleanup to undo the configuration changes we've made.
registerCleanupFunction(() => {
certOverrideService.clearValidityOverride("localhost", server.port);
Services.prefs.setIntPref("network.proxy.type", oldProxyType);
MockRegistrar.unregister(mockProxy);
server.close();
diff --git browser/base/content/test/siteIdentity/head.js browser/base/content/test/siteIdentity/head.js
--- browser/base/content/test/siteIdentity/head.js
+++ browser/base/content/test/siteIdentity/head.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
/**
* Returns a Promise that resolves once a new tab has been opened in
* a xul:tabbrowser.
*
* @param aTabBrowser
* The xul:tabbrowser to monitor for a new tab.
* @return {Promise}
diff --git browser/base/content/test/static/head.js browser/base/content/test/static/head.js
--- browser/base/content/test/static/head.js
+++ browser/base/content/test/static/head.js
@@ -3,18 +3,18 @@
"use strict";
/* Shorthand constructors to construct an nsI(Local)File and zip reader: */
const LocalFile = new Components.Constructor("@mozilla.org/file/local;1", Ci.nsIFile, "initWithPath");
const ZipReader = new Components.Constructor("@mozilla.org/libjar/zip-reader;1", "nsIZipReader", "open");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/osfile.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {OS, require} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
/**
* Returns a promise that is resolved with a list of files that have one of the
* extensions passed, represented by their nsIURI objects, which exist inside
* the directory passed.
*
* @param dir the directory which to scan for files (nsIFile)
diff --git browser/base/content/test/sync/browser_fxa_badge.js browser/base/content/test/sync/browser_fxa_badge.js
--- browser/base/content/test/sync/browser_fxa_badge.js
+++ browser/base/content/test/sync/browser_fxa_badge.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-ChromeUtils.import("resource://gre/modules/AppMenuNotifications.jsm");
+const {AppMenuNotifications} = ChromeUtils.import("resource://gre/modules/AppMenuNotifications.jsm");
add_task(async function test_unconfigured_no_badge() {
const oldUIState = UIState.get;
UIState.get = () => ({
status: UIState.STATUS_NOT_CONFIGURED,
});
Services.obs.notifyObservers(null, UIState.ON_UPDATE);
diff --git browser/base/content/test/sync/browser_fxa_web_channel.js browser/base/content/test/sync/browser_fxa_web_channel.js
--- browser/base/content/test/sync/browser_fxa_web_channel.js
+++ browser/base/content/test/sync/browser_fxa_web_channel.js
@@ -7,17 +7,17 @@ XPCOMUtils.defineLazyGetter(this, "FxAcc
return ChromeUtils.import("resource://gre/modules/FxAccountsCommon.js", {});
});
ChromeUtils.defineModuleGetter(this, "WebChannel",
"resource://gre/modules/WebChannel.jsm");
// FxAccountsWebChannel isn't explicitly exported by FxAccountsWebChannel.jsm
// but we can get it here via a backstage pass.
-var {FxAccountsWebChannel} = ChromeUtils.import("resource://gre/modules/FxAccountsWebChannel.jsm", {});
+var {FxAccountsWebChannel} = ChromeUtils.import("resource://gre/modules/FxAccountsWebChannel.jsm", null);
const TEST_HTTP_PATH = "http://example.com";
const TEST_BASE_URL = TEST_HTTP_PATH + "/browser/browser/base/content/test/sync/browser_fxa_web_channel.html";
const TEST_CHANNEL_ID = "account_updates_test";
var gTests = [
{
desc: "FxA Web Channel - should receive message about profile changes",
diff --git browser/base/content/test/tabcrashed/browser_autoSubmitRequest.js browser/base/content/test/tabcrashed/browser_autoSubmitRequest.js
--- browser/base/content/test/tabcrashed/browser_autoSubmitRequest.js
+++ browser/base/content/test/tabcrashed/browser_autoSubmitRequest.js
@@ -1,15 +1,15 @@
"use strict";
const PAGE = "data:text/html,<html><body>A%20regular,%20everyday,%20normal%20page.";
const AUTOSUBMIT_PREF = "browser.crashReports.unsubmittedCheck.autoSubmit2";
const {TabStateFlusher} =
- ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
+ ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm");
// On debug builds, crashing tabs results in much thinking, which
// slows down the test and results in intermittent test timeouts,
// so we'll pump up the expected timeout for this test.
requestLongerTimeout(2);
/**
* Tests that if the user is not configured to autosubmit
diff --git browser/base/content/test/tabs/browser_abandonment_telemetry.js browser/base/content/test/tabs/browser_abandonment_telemetry.js
--- browser/base/content/test/tabs/browser_abandonment_telemetry.js
+++ browser/base/content/test/tabs/browser_abandonment_telemetry.js
@@ -1,11 +1,11 @@
"use strict";
-const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
+const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm");
// Keep this in sync with the order in Histograms.json for
// BUSY_TAB_ABANDONED
const CATEGORIES = [
"stop",
"back",
"forward",
"historyNavigation",
diff --git browser/base/content/test/tabs/browser_bug_1387976_restore_lazy_tab_browser_muted_state.js browser/base/content/test/tabs/browser_bug_1387976_restore_lazy_tab_browser_muted_state.js
--- browser/base/content/test/tabs/browser_bug_1387976_restore_lazy_tab_browser_muted_state.js
+++ browser/base/content/test/tabs/browser_bug_1387976_restore_lazy_tab_browser_muted_state.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { TabState } = ChromeUtils.import("resource:///modules/sessionstore/TabState.jsm", {});
+const { TabState } = ChromeUtils.import("resource:///modules/sessionstore/TabState.jsm");
/**
* Simulate a restart of a tab by removing it, then add a lazy tab
* which is restored with the tabData of the removed tab.
*
* @param tab
* The tab to restart.
* @return {Object} the restored lazy tab
diff --git browser/base/content/test/tabs/browser_newwindow_tabstrip_overflow.js browser/base/content/test/tabs/browser_newwindow_tabstrip_overflow.js
--- browser/base/content/test/tabs/browser_newwindow_tabstrip_overflow.js
+++ browser/base/content/test/tabs/browser_newwindow_tabstrip_overflow.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const {LightweightThemeManager} = ChromeUtils.import("resource://gre/modules/LightweightThemeManager.jsm", {});
+const {LightweightThemeManager} = ChromeUtils.import("resource://gre/modules/LightweightThemeManager.jsm");
registerCleanupFunction(() => {
LightweightThemeManager.currentTheme = null;
Services.prefs.clearUserPref("lightweightThemes.usedThemes");
});
add_task(async function withoutLWT() {
let win = await BrowserTestUtils.openNewBrowserWindow();
ok(!win.gBrowser.tabContainer.hasAttribute("overflow"), "tab container not overflowing");
diff --git browser/base/content/test/trackingUI/browser_trackingUI_report_breakage.js browser/base/content/test/trackingUI/browser_trackingUI_report_breakage.js
--- browser/base/content/test/trackingUI/browser_trackingUI_report_breakage.js
+++ browser/base/content/test/trackingUI/browser_trackingUI_report_breakage.js
@@ -6,19 +6,19 @@
const TRACKING_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
const BENIGN_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/benignPage.html";
const COOKIE_PAGE = "http://not-tracking.example.com/browser/browser/base/content/test/trackingUI/cookiePage.html";
const TP_PREF = "privacy.trackingprotection.enabled";
const PREF_REPORT_BREAKAGE_ENABLED = "browser.contentblocking.reportBreakage.enabled";
const PREF_REPORT_BREAKAGE_URL = "browser.contentblocking.reportBreakage.url";
-let {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js", {});
-let {CommonUtils} = ChromeUtils.import("resource://services-common/utils.js", {});
-let {Preferences} = ChromeUtils.import("resource://gre/modules/Preferences.jsm", {});
+let {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js");
+let {CommonUtils} = ChromeUtils.import("resource://services-common/utils.js");
+let {Preferences} = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
add_task(async function setup() {
await UrlClassifierTestUtils.addTestTrackers();
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
registerCleanupFunction(() => {
diff --git browser/base/content/test/trackingUI/head.js browser/base/content/test/trackingUI/head.js
--- browser/base/content/test/trackingUI/head.js
+++ browser/base/content/test/trackingUI/head.js
@@ -1,9 +1,9 @@
-var {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
+var {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm");
/**
* Waits for a load (or custom) event to finish in a given tab. If provided
* load an uri into the tab.
*
* @param tab
* The tab to load into.
* @param [optional] url
diff --git browser/base/content/test/urlbar/Panel.jsm browser/base/content/test/urlbar/Panel.jsm
--- browser/base/content/test/urlbar/Panel.jsm
+++ browser/base/content/test/urlbar/Panel.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var EXPORTED_SYMBOLS = [
"Panel",
];
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
+const {clearInterval, setInterval, setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
var Panel = function(panelElt, iframeURL) {
this.p = panelElt;
this.iframeURL = iframeURL;
this._initPanel();
this.urlbar.addEventListener("keydown", this);
this.urlbar.addEventListener("input", this);
this._emitQueue = [];
diff --git browser/base/content/test/urlbar/browser_urlbarAboutHomeLoading.js browser/base/content/test/urlbar/browser_urlbarAboutHomeLoading.js
--- browser/base/content/test/urlbar/browser_urlbarAboutHomeLoading.js
+++ browser/base/content/test/urlbar/browser_urlbarAboutHomeLoading.js
@@ -1,12 +1,12 @@
"use strict";
-const {SessionSaver} = ChromeUtils.import("resource:///modules/sessionstore/SessionSaver.jsm", {});
-const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
+const {SessionSaver} = ChromeUtils.import("resource:///modules/sessionstore/SessionSaver.jsm");
+const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm");
/**
* Test what happens if loading a URL that should clear the
* location bar after a parent process URL.
*/
add_task(async function clearURLBarAfterParentProcessURL() {
let tab = await new Promise(resolve => {
gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, "about:preferences");
diff --git browser/base/content/test/urlbar/browser_urlbar_search_no_speculative_connect_with_client_cert.js browser/base/content/test/urlbar/browser_urlbar_search_no_speculative_connect_with_client_cert.js
--- browser/base/content/test/urlbar/browser_urlbar_search_no_speculative_connect_with_client_cert.js
+++ browser/base/content/test/urlbar/browser_urlbar_search_no_speculative_connect_with_client_cert.js
@@ -3,17 +3,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
// Tests that we don't speculatively connect when user certificates are installed
const { MockRegistrar } =
- ChromeUtils.import("resource://testing-common/MockRegistrar.jsm", {});
+ ChromeUtils.import("resource://testing-common/MockRegistrar.jsm");
const certService = Cc["@mozilla.org/security/local-cert-service;1"]
.getService(Ci.nsILocalCertService);
const certOverrideService = Cc["@mozilla.org/security/certoverride;1"]
.getService(Ci.nsICertOverrideService);
const host = "localhost";
let uri;
diff --git browser/base/content/test/urlbar/head.js browser/base/content/test/urlbar/head.js
--- browser/base/content/test/urlbar/head.js
+++ browser/base/content/test/urlbar/head.js
@@ -1,11 +1,11 @@
/* eslint-env mozilla/frame-script */
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
HttpServer: "resource://testing-common/httpd.js",
PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.jsm",
Preferences: "resource://gre/modules/Preferences.jsm",
SearchTestUtils: "resource://testing-common/SearchTestUtils.jsm",
UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm",
@@ -26,17 +26,17 @@ SearchTestUtils.init(Assert, registerCle
* However, the browser UI will behave differently for loads stopped directly from
* the progress listener (effectively in the middle of a call to loadURI) and so there
* are cases where you may want to avoid stopping the load directly from within the
* progress listener callback.
* @return promise
*/
function waitForDocLoadAndStopIt(aExpectedURL, aBrowser = gBrowser.selectedBrowser, aStopFromProgressListener = true) {
function content_script(contentStopFromProgressListener) {
- ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+ const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
let wp = docShell.QueryInterface(Ci.nsIWebProgress);
function stopContent(now, uri) {
if (now) {
/* Hammer time. */
content.stop();
/* Let the parent know we're done. */
diff --git browser/base/content/test/webextensions/browser_extension_sideloading.js browser/base/content/test/webextensions/browser_extension_sideloading.js
--- browser/base/content/test/webextensions/browser_extension_sideloading.js
+++ browser/base/content/test/webextensions/browser_extension_sideloading.js
@@ -1,12 +1,12 @@
/* eslint-disable mozilla/no-arbitrary-setTimeout */
-const {AddonManagerPrivate} = ChromeUtils.import("resource://gre/modules/AddonManager.jsm", {});
+const {AddonManagerPrivate} = ChromeUtils.import("resource://gre/modules/AddonManager.jsm");
-const {AddonTestUtils} = ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm", {});
+const {AddonTestUtils} = ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
AddonTestUtils.initMochitest(this);
async function createWebExtension(details) {
let options = {
manifest: {
applications: {gecko: {id: details.id}},
diff --git browser/base/content/test/webextensions/browser_extension_update_background.js browser/base/content/test/webextensions/browser_extension_update_background.js
--- browser/base/content/test/webextensions/browser_extension_update_background.js
+++ browser/base/content/test/webextensions/browser_extension_update_background.js
@@ -1,11 +1,11 @@
-const {AddonManagerPrivate} = ChromeUtils.import("resource://gre/modules/AddonManager.jsm", {});
+const {AddonManagerPrivate} = ChromeUtils.import("resource://gre/modules/AddonManager.jsm");
-const {AddonTestUtils} = ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm", {});
+const {AddonTestUtils} = ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
AddonTestUtils.initMochitest(this);
const ID = "update2@tests.mozilla.org";
const ID_ICON = "update_icon2@tests.mozilla.org";
const ID_PERMS = "update_perms@tests.mozilla.org";
const ID_LEGACY = "legacy_update@tests.mozilla.org";
const FAKE_INSTALL_TELEMETRY_SOURCE = "fake-install-source";
diff --git browser/base/content/test/webextensions/browser_extension_update_background_noprompt.js browser/base/content/test/webextensions/browser_extension_update_background_noprompt.js
--- browser/base/content/test/webextensions/browser_extension_update_background_noprompt.js
+++ browser/base/content/test/webextensions/browser_extension_update_background_noprompt.js
@@ -1,9 +1,9 @@
-const {AddonManagerPrivate} = ChromeUtils.import("resource://gre/modules/AddonManager.jsm", {});
+const {AddonManagerPrivate} = ChromeUtils.import("resource://gre/modules/AddonManager.jsm");
const ID_PERMS = "update_perms@tests.mozilla.org";
const ID_ORIGINS = "update_origins@tests.mozilla.org";
function getBadgeStatus() {
let menuButton = document.getElementById("PanelUI-menu-button");
return menuButton.getAttribute("badge-status");
}
diff --git browser/base/content/test/webextensions/head.js browser/base/content/test/webextensions/head.js
--- browser/base/content/test/webextensions/head.js
+++ browser/base/content/test/webextensions/head.js
@@ -1,17 +1,17 @@
ChromeUtils.defineModuleGetter(this, "AddonTestUtils", "resource://testing-common/AddonTestUtils.jsm");
const BASE = getRootDirectory(gTestPath)
.replace("chrome://mochitests/content/", "https://example.com/");
-ChromeUtils.import("resource:///modules/ExtensionsUI.jsm");
+var {ExtensionsUI} = ChromeUtils.import("resource:///modules/ExtensionsUI.jsm");
XPCOMUtils.defineLazyGetter(this, "Management", () => {
// eslint-disable-next-line no-shadow
- const {Management} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ const {Management} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
return Management;
});
ChromeUtils.import("resource://testing-common/CustomizableUITestUtils.jsm", this);
let gCUITestUtils = new CustomizableUITestUtils(window);
/**
* Wait for the given PopupNotification to display
@@ -35,17 +35,17 @@ function promisePopupNotificationShown(n
resolve(PopupNotifications.panel.firstElementChild);
}
PopupNotifications.panel.addEventListener("popupshown", popupshown);
});
}
function promiseAppMenuNotificationShown(id) {
- ChromeUtils.import("resource://gre/modules/AppMenuNotifications.jsm");
+ const {AppMenuNotifications} = ChromeUtils.import("resource://gre/modules/AppMenuNotifications.jsm");
return new Promise(resolve => {
function popupshown() {
let notification = AppMenuNotifications.activeNotification;
if (!notification) { return; }
is(notification.id, id, `${id} notification shown`);
ok(PanelUI.isNotificationPanelOpen, "notification panel open");
diff --git browser/base/content/test/webrtc/browser_webrtc_hooks.js browser/base/content/test/webrtc/browser_webrtc_hooks.js
--- browser/base/content/test/webrtc/browser_webrtc_hooks.js
+++ browser/base/content/test/webrtc/browser_webrtc_hooks.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource:///modules/webrtcUI.jsm");
+const {webrtcUI} = ChromeUtils.import("resource:///modules/webrtcUI.jsm");
const ORIGIN = "https://example.com";
async function tryPeerConnection(browser, expectedError = null) {
let errtype = await ContentTask.spawn(browser, null, async function() {
let pc = new content.RTCPeerConnection();
try {
await pc.createOffer({offerToReceiveAudio: true});
diff --git browser/base/content/test/webrtc/get_user_media_content_script.js browser/base/content/test/webrtc/get_user_media_content_script.js
--- browser/base/content/test/webrtc/get_user_media_content_script.js
+++ browser/base/content/test/webrtc/get_user_media_content_script.js
@@ -1,15 +1,15 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
/* eslint-env mozilla/frame-script */
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "MediaManagerService",
"@mozilla.org/mediaManagerService;1",
"nsIMediaManagerService");
const kObservedTopics = [
"getUserMedia:response:allow",
"getUserMedia:revoke",
"getUserMedia:response:deny",
diff --git browser/base/content/test/webrtc/head.js browser/base/content/test/webrtc/head.js
--- browser/base/content/test/webrtc/head.js
+++ browser/base/content/test/webrtc/head.js
@@ -1,10 +1,10 @@
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource:///modules/SitePermissions.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {SitePermissions} = ChromeUtils.import("resource:///modules/SitePermissions.jsm");
const PREF_PERMISSION_FAKE = "media.navigator.permission.fake";
const PREF_AUDIO_LOOPBACK = "media.audio_loopback_dev";
const PREF_VIDEO_LOOPBACK = "media.video_loopback_dev";
const PREF_FAKE_STREAMS = "media.navigator.streams.fake";
const PREF_FOCUS_SOURCE = "media.getusermedia.window.focus_source.enabled";
const CONTENT_SCRIPT_HELPER = getRootDirectory(gTestPath) + "get_user_media_content_script.js";
diff --git browser/base/content/utilityOverlay.js browser/base/content/utilityOverlay.js
--- browser/base/content/utilityOverlay.js
+++ browser/base/content/utilityOverlay.js
@@ -1,17 +1,17 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// Services = object with smart getters for common XPCOM services
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
ContextualIdentityService: "resource://gre/modules/ContextualIdentityService.jsm",
ShellService: "resource:///modules/ShellService.jsm",
diff --git browser/base/content/webext-panels.js browser/base/content/webext-panels.js
--- browser/base/content/webext-panels.js
+++ browser/base/content/webext-panels.js
@@ -5,18 +5,18 @@
// Via webext-panels.xul
/* import-globals-from browser.js */
/* import-globals-from nsContextMenu.js */
ChromeUtils.defineModuleGetter(this, "ExtensionParent",
"resource://gre/modules/ExtensionParent.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/ExtensionUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {ExtensionUtils} = ChromeUtils.import("resource://gre/modules/ExtensionUtils.jsm");
var {
promiseEvent,
} = ExtensionUtils;
const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
function getBrowser(panel) {
diff --git browser/base/content/webrtcIndicator.js browser/base/content/webrtcIndicator.js
--- browser/base/content/webrtcIndicator.js
+++ browser/base/content/webrtcIndicator.js
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/webrtcUI.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {webrtcUI} = ChromeUtils.import("resource:///modules/webrtcUI.jsm");
const BUNDLE_URL = "chrome://browser/locale/webrtcIndicator.properties";
var gStringBundle;
function init(event) {
gStringBundle = Services.strings.createBundle(BUNDLE_URL);
let brand = Services.strings.createBundle("chrome://branding/locale/brand.properties");
diff --git browser/components/about/AboutPrivateBrowsingHandler.jsm browser/components/about/AboutPrivateBrowsingHandler.jsm
--- browser/components/about/AboutPrivateBrowsingHandler.jsm
+++ browser/components/about/AboutPrivateBrowsingHandler.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["AboutPrivateBrowsingHandler"];
-ChromeUtils.import("resource://gre/modules/remotepagemanager/RemotePageManagerParent.jsm");
+const {RemotePages} = ChromeUtils.import("resource://gre/modules/remotepagemanager/RemotePageManagerParent.jsm");
var AboutPrivateBrowsingHandler = {
_topics: [
"DontShowIntroPanelAgain",
"OpenPrivateWindow",
],
init() {
diff --git browser/components/about/test/unit/test_getURIFlags.js browser/components/about/test/unit/test_getURIFlags.js
--- browser/components/about/test/unit/test_getURIFlags.js
+++ browser/components/about/test/unit/test_getURIFlags.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const contract = "@mozilla.org/network/protocol/about;1?what=newtab";
const am = Cc[contract].getService(Ci.nsIAboutModule);
const uri = Services.io.newURI("about:newtab");
function run_test() {
test_AS_enabled_flags();
}
diff --git browser/components/aboutconfig/content/aboutconfig.js browser/components/aboutconfig/content/aboutconfig.js
--- browser/components/aboutconfig/content/aboutconfig.js
+++ browser/components/aboutconfig/content/aboutconfig.js
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Preferences.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Preferences} = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
let gDefaultBranch = Services.prefs.getDefaultBranch("");
let gPrefArray;
let gPrefInEdit = null;
class PrefRow {
constructor(name) {
this.name = name;
diff --git browser/components/attribution/AttributionCode.jsm browser/components/attribution/AttributionCode.jsm
--- browser/components/attribution/AttributionCode.jsm
+++ browser/components/attribution/AttributionCode.jsm
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["AttributionCode"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm");
ChromeUtils.defineModuleGetter(this, "OS",
"resource://gre/modules/osfile.jsm");
ChromeUtils.defineModuleGetter(this, "Services",
"resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
diff --git browser/components/attribution/test/xpcshell/test_AttributionCode.js browser/components/attribution/test/xpcshell/test_AttributionCode.js
--- browser/components/attribution/test/xpcshell/test_AttributionCode.js
+++ browser/components/attribution/test/xpcshell/test_AttributionCode.js
@@ -1,17 +1,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
"use strict";
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource:///modules/AttributionCode.jsm");
-ChromeUtils.import("resource://gre/modules/osfile.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {AttributionCode} = ChromeUtils.import("resource:///modules/AttributionCode.jsm");
+const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
let validAttrCodes = [
{code: "source%3Dgoogle.com%26medium%3Dorganic%26campaign%3D(not%20set)%26content%3D(not%20set)",
parsed: {"source": "google.com", "medium": "organic",
"campaign": "(not%20set)", "content": "(not%20set)"}},
{code: "source%3Dgoogle.com%26medium%3Dorganic%26campaign%3D%26content%3D",
parsed: {"source": "google.com", "medium": "organic"}},
{code: "source%3Dgoogle.com%26medium%3Dorganic%26campaign%3D(not%20set)",
diff --git browser/components/attribution/test/xpcshell/test_attribution.js browser/components/attribution/test/xpcshell/test_attribution.js
--- browser/components/attribution/test/xpcshell/test_attribution.js
+++ browser/components/attribution/test/xpcshell/test_attribution.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/AttributionCode.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AttributionCode} = ChromeUtils.import("resource:///modules/AttributionCode.jsm");
add_task(async function test_attribution() {
let appPath = Services.dirsvc.get("GreD", Ci.nsIFile).parent.parent.path;
let attributionSvc = Cc["@mozilla.org/mac-attribution;1"]
.getService(Ci.nsIMacAttributionService);
attributionSvc.setReferrerUrl(appPath, "", true);
let referrer = attributionSvc.getReferrerUrl(appPath);
diff --git browser/components/contextualidentity/test/browser/browser_count_and_remove.js browser/components/contextualidentity/test/browser/browser_count_and_remove.js
--- browser/components/contextualidentity/test/browser/browser_count_and_remove.js
+++ browser/components/contextualidentity/test/browser/browser_count_and_remove.js
@@ -1,12 +1,12 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
-ChromeUtils.import("resource://gre/modules/ContextualIdentityService.jsm");
+const {ContextualIdentityService} = ChromeUtils.import("resource://gre/modules/ContextualIdentityService.jsm");
function openTabInUserContext(userContextId) {
let tab = BrowserTestUtils.addTab(gBrowser, "about:blank", {userContextId});
gBrowser.selectedTab = tab;
}
add_task(async function setup() {
// make sure userContext is enabled.
diff --git browser/components/contextualidentity/test/browser/browser_favicon.js browser/components/contextualidentity/test/browser/browser_favicon.js
--- browser/components/contextualidentity/test/browser/browser_favicon.js
+++ browser/components/contextualidentity/test/browser/browser_favicon.js
@@ -1,14 +1,14 @@
/*
* Bug 1270678 - A test case to test does the favicon obey originAttributes.
*/
-ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-let {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js", {});
+const {PlacesUtils} = ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
+const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+let {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js");
const USER_CONTEXTS = [
"default",
"personal",
"work",
];
let gHttpServer = null;
diff --git browser/components/contextualidentity/test/browser/browser_forgetaboutsite.js browser/components/contextualidentity/test/browser/browser_forgetaboutsite.js
--- browser/components/contextualidentity/test/browser/browser_forgetaboutsite.js
+++ browser/components/contextualidentity/test/browser/browser_forgetaboutsite.js
@@ -1,17 +1,17 @@
/*
* Bug 1238183 - Test cases for forgetAboutSite with userContextId.
*/
const CC = Components.Constructor;
-let {ForgetAboutSite} = ChromeUtils.import("resource://gre/modules/ForgetAboutSite.jsm", {});
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-let {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js", {});
+let {ForgetAboutSite} = ChromeUtils.import("resource://gre/modules/ForgetAboutSite.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+let {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js");
const USER_CONTEXTS = [
"default",
"personal",
];
const TEST_HOST = "example.com";
const TEST_URL = "http://" + TEST_HOST + "/browser/browser/components/contextualidentity/test/browser/";
const COOKIE_NAME = "userContextId";
diff --git browser/components/contextualidentity/test/browser/browser_imageCache.js browser/components/contextualidentity/test/browser/browser_imageCache.js
--- browser/components/contextualidentity/test/browser/browser_imageCache.js
+++ browser/components/contextualidentity/test/browser/browser_imageCache.js
@@ -1,9 +1,9 @@
-let {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js", {});
+let {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js");
const NUM_USER_CONTEXTS = 3;
let gHits = 0;
let server = new HttpServer();
server.registerPathHandler("/image.png", imageHandler);
server.registerPathHandler("/file.html", fileHandler);
diff --git browser/components/customizableui/CustomizableUI.jsm browser/components/customizableui/CustomizableUI.jsm
--- browser/components/customizableui/CustomizableUI.jsm
+++ browser/components/customizableui/CustomizableUI.jsm
@@ -1,19 +1,19 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["CustomizableUI"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
SearchWidgetTracker: "resource:///modules/SearchWidgetTracker.jsm",
CustomizableWidgets: "resource:///modules/CustomizableWidgets.jsm",
DeferredTask: "resource://gre/modules/DeferredTask.jsm",
PanelMultiView: "resource:///modules/PanelMultiView.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
ShortcutUtils: "resource://gre/modules/ShortcutUtils.jsm",
diff --git browser/components/customizableui/CustomizableWidgets.jsm browser/components/customizableui/CustomizableWidgets.jsm
--- browser/components/customizableui/CustomizableWidgets.jsm
+++ browser/components/customizableui/CustomizableWidgets.jsm
@@ -1,20 +1,20 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["CustomizableWidgets"];
-ChromeUtils.import("resource:///modules/CustomizableUI.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {CustomizableUI} = ChromeUtils.import("resource:///modules/CustomizableUI.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
PanelView: "resource:///modules/PanelMultiView.jsm",
RecentlyClosedTabsAndWindowsMenuUtils: "resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm",
ShortcutUtils: "resource://gre/modules/ShortcutUtils.jsm",
CharsetMenu: "resource://gre/modules/CharsetMenu.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
Sanitizer: "resource:///modules/Sanitizer.jsm",
diff --git browser/components/customizableui/CustomizeMode.jsm browser/components/customizableui/CustomizeMode.jsm
--- browser/components/customizableui/CustomizeMode.jsm
+++ browser/components/customizableui/CustomizeMode.jsm
@@ -16,20 +16,20 @@ const kKeepBroadcastAttributes = "keepbr
const kPanelItemContextMenu = "customizationPanelItemContextMenu";
const kPaletteItemContextMenu = "customizationPaletteItemContextMenu";
const kDownloadAutohideCheckboxId = "downloads-button-autohide-checkbox";
const kDownloadAutohidePanelId = "downloads-button-autohide-panel";
const kDownloadAutoHidePref = "browser.download.autohideButton";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/CustomizableUI.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {CustomizableUI} = ChromeUtils.import("resource:///modules/CustomizableUI.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["CSS"]);
ChromeUtils.defineModuleGetter(this, "DragPositionManager",
"resource:///modules/DragPositionManager.jsm");
ChromeUtils.defineModuleGetter(this, "BrowserUtils",
"resource://gre/modules/BrowserUtils.jsm");
ChromeUtils.defineModuleGetter(this, "LightweightThemeManager",
diff --git browser/components/customizableui/PanelMultiView.jsm browser/components/customizableui/PanelMultiView.jsm
--- browser/components/customizableui/PanelMultiView.jsm
+++ browser/components/customizableui/PanelMultiView.jsm
@@ -99,18 +99,18 @@
"use strict";
var EXPORTED_SYMBOLS = [
"PanelMultiView",
"PanelView",
];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "CustomizableUI",
"resource:///modules/CustomizableUI.jsm");
XPCOMUtils.defineLazyGetter(this, "gBundle", function() {
return Services.strings.createBundle(
"chrome://browser/locale/browser.properties");
});
diff --git browser/components/customizableui/ScrollbarSampler.jsm browser/components/customizableui/ScrollbarSampler.jsm
--- browser/components/customizableui/ScrollbarSampler.jsm
+++ browser/components/customizableui/ScrollbarSampler.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["ScrollbarSampler"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var gSystemScrollbarWidth = null;
var ScrollbarSampler = {
getSystemScrollbarWidth() {
if (gSystemScrollbarWidth !== null) {
return Promise.resolve(gSystemScrollbarWidth);
}
diff --git browser/components/customizableui/SearchWidgetTracker.jsm browser/components/customizableui/SearchWidgetTracker.jsm
--- browser/components/customizableui/SearchWidgetTracker.jsm
+++ browser/components/customizableui/SearchWidgetTracker.jsm
@@ -5,17 +5,17 @@
/*
* Keeps the "browser.search.widget.inNavBar" preference synchronized.
*/
"use strict";
var EXPORTED_SYMBOLS = ["SearchWidgetTracker"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "CustomizableUI",
"resource:///modules/CustomizableUI.jsm");
const WIDGET_ID = "search-container";
const PREF_NAME = "browser.search.widget.inNavBar";
const SearchWidgetTracker = {
diff --git browser/components/customizableui/test/CustomizableUITestUtils.jsm browser/components/customizableui/test/CustomizableUITestUtils.jsm
--- browser/components/customizableui/test/CustomizableUITestUtils.jsm
+++ browser/components/customizableui/test/CustomizableUITestUtils.jsm
@@ -5,19 +5,19 @@
/**
* Shared functions generally available for tests involving PanelMultiView and
* the CustomizableUI elements in the browser window.
*/
var EXPORTED_SYMBOLS = ["CustomizableUITestUtils"];
-ChromeUtils.import("resource://testing-common/Assert.jsm");
-ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
-ChromeUtils.import("resource://testing-common/TestUtils.jsm");
+const {Assert} = ChromeUtils.import("resource://testing-common/Assert.jsm");
+const {BrowserTestUtils} = ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
+const {TestUtils} = ChromeUtils.import("resource://testing-common/TestUtils.jsm");
ChromeUtils.defineModuleGetter(this, "CustomizableUI",
"resource:///modules/CustomizableUI.jsm");
class CustomizableUITestUtils {
/**
* Constructs an instance that operates with the specified browser window.
*/
diff --git browser/components/customizableui/test/browser_1007336_lwthemes_in_customize_mode.js browser/components/customizableui/test/browser_1007336_lwthemes_in_customize_mode.js
--- browser/components/customizableui/test/browser_1007336_lwthemes_in_customize_mode.js
+++ browser/components/customizableui/test/browser_1007336_lwthemes_in_customize_mode.js
@@ -2,17 +2,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const DEFAULT_THEME_ID = "default-theme@mozilla.org";
const LIGHT_THEME_ID = "firefox-compact-light@mozilla.org";
const DARK_THEME_ID = "firefox-compact-dark@mozilla.org";
-const {LightweightThemeManager} = ChromeUtils.import("resource://gre/modules/LightweightThemeManager.jsm", {});
+const {LightweightThemeManager} = ChromeUtils.import("resource://gre/modules/LightweightThemeManager.jsm");
add_task(async function() {
Services.prefs.clearUserPref("lightweightThemes.usedThemes");
Services.prefs.clearUserPref("lightweightThemes.recommendedThemes");
await startCustomizing();
// Check restore defaults button is disabled.
ok(document.getElementById("customization-reset-button").disabled,
diff --git browser/components/customizableui/test/browser_1042100_default_placements_update.js browser/components/customizableui/test/browser_1042100_default_placements_update.js
--- browser/components/customizableui/test/browser_1042100_default_placements_update.js
+++ browser/components/customizableui/test/browser_1042100_default_placements_update.js
@@ -5,17 +5,17 @@
// NB: This uses some ugly hacks to get into the CUI module from elsewhere...
// don't try this at home, kids.
function test() {
// Customize something to make sure stuff changed:
CustomizableUI.addWidgetToArea("save-page-button", CustomizableUI.AREA_NAVBAR);
// Check what version we're on:
- let CustomizableUIBSPass = ChromeUtils.import("resource:///modules/CustomizableUI.jsm", {});
+ let CustomizableUIBSPass = ChromeUtils.import("resource:///modules/CustomizableUI.jsm", null);
let oldState = CustomizableUIBSPass.gSavedState;
registerCleanupFunction(() => CustomizableUIBSPass.gSavedState = oldState );
is(CustomizableUIBSPass.gFuturePlacements.size, 0,
"All future placements should be dealt with by now.");
let {CustomizableUIInternal, gFuturePlacements, gPalette} = CustomizableUIBSPass;
diff --git browser/components/customizableui/test/browser_1096763_seen_widgets_post_reset.js browser/components/customizableui/test/browser_1096763_seen_widgets_post_reset.js
--- browser/components/customizableui/test/browser_1096763_seen_widgets_post_reset.js
+++ browser/components/customizableui/test/browser_1096763_seen_widgets_post_reset.js
@@ -5,17 +5,17 @@ const BUTTONID = "test-seenwidget-post-r
add_task(async function() {
CustomizableUI.createWidget({
id: BUTTONID,
label: "Test widget seen post reset",
defaultArea: CustomizableUI.AREA_NAVBAR,
});
const kPrefCustomizationState = "browser.uiCustomization.state";
- let bsPass = ChromeUtils.import("resource:///modules/CustomizableUI.jsm", {});
+ let bsPass = ChromeUtils.import("resource:///modules/CustomizableUI.jsm", null);
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.");
CustomizableUI.addWidgetToArea(BUTTONID, CustomizableUI.AREA_NAVBAR);
gCustomizeMode.removeFromArea(document.getElementById(BUTTONID));
let hasUserValue = Services.prefs.prefHasUserValue(kPrefCustomizationState);
ok(hasUserValue, "Pref should be set right now.");
if (hasUserValue) {
diff --git browser/components/customizableui/test/browser_1161838_inserted_new_default_buttons.js browser/components/customizableui/test/browser_1161838_inserted_new_default_buttons.js
--- browser/components/customizableui/test/browser_1161838_inserted_new_default_buttons.js
+++ browser/components/customizableui/test/browser_1161838_inserted_new_default_buttons.js
@@ -1,17 +1,17 @@
"use strict";
// NB: This uses some ugly hacks to get into the CUI module from elsewhere...
// don't try this at home, kids.
function test() {
// Customize something to make sure stuff changed:
CustomizableUI.addWidgetToArea("save-page-button", CustomizableUI.AREA_NAVBAR);
- let CustomizableUIBSPass = ChromeUtils.import("resource:///modules/CustomizableUI.jsm", {});
+ let CustomizableUIBSPass = ChromeUtils.import("resource:///modules/CustomizableUI.jsm", null);
is(CustomizableUIBSPass.gFuturePlacements.size, 0,
"All future placements should be dealt with by now.");
let {CustomizableUIInternal, gFuturePlacements, gPalette} = CustomizableUIBSPass;
// Force us to have a saved state:
CustomizableUIInternal.saveState();
diff --git browser/components/customizableui/test/browser_989338_saved_placements_not_resaved.js browser/components/customizableui/test/browser_989338_saved_placements_not_resaved.js
--- browser/components/customizableui/test/browser_989338_saved_placements_not_resaved.js
+++ browser/components/customizableui/test/browser_989338_saved_placements_not_resaved.js
@@ -5,17 +5,17 @@
"use strict";
const BUTTONID = "test-widget-saved-earlier";
const AREAID = "test-area-saved-earlier";
var hadSavedState;
function test() {
// Hack our way into the module to fake a saved state that isn't there...
- let backstagePass = ChromeUtils.import("resource:///modules/CustomizableUI.jsm", {});
+ let backstagePass = ChromeUtils.import("resource:///modules/CustomizableUI.jsm", null);
hadSavedState = backstagePass.gSavedState != null;
if (!hadSavedState) {
backstagePass.gSavedState = {placements: {}};
}
backstagePass.gSavedState.placements[AREAID] = [BUTTONID];
// Put bogus stuff in the saved state for the nav-bar, so as to check the current placements
// override this one...
backstagePass.gSavedState.placements[CustomizableUI.AREA_NAVBAR] = ["bogus-navbar-item"];
@@ -36,17 +36,17 @@ function test() {
ok(savedNavbar, "Should have saved nav-bar contents");
if (savedNavbar) {
placementArraysEqual(CustomizableUI.AREA_NAVBAR, newSavedState.placements[CustomizableUI.AREA_NAVBAR],
CustomizableUI.getWidgetIdsInArea(CustomizableUI.AREA_NAVBAR));
}
}
registerCleanupFunction(function() {
- let backstagePass = ChromeUtils.import("resource:///modules/CustomizableUI.jsm", {});
+ let backstagePass = ChromeUtils.import("resource:///modules/CustomizableUI.jsm", null);
if (!hadSavedState) {
backstagePass.gSavedState = null;
} else {
let savedPlacements = backstagePass.gSavedState.placements;
delete savedPlacements[AREAID];
let realNavBarPlacements = CustomizableUI.getWidgetIdsInArea(CustomizableUI.AREA_NAVBAR);
savedPlacements[CustomizableUI.AREA_NAVBAR] = realNavBarPlacements;
}
diff --git browser/components/customizableui/test/browser_PanelMultiView.js browser/components/customizableui/test/browser_PanelMultiView.js
--- browser/components/customizableui/test/browser_PanelMultiView.js
+++ browser/components/customizableui/test/browser_PanelMultiView.js
@@ -2,17 +2,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
/**
* Unit tests for the PanelMultiView module.
*/
-ChromeUtils.import("resource:///modules/PanelMultiView.jsm");
+const {PanelMultiView} = ChromeUtils.import("resource:///modules/PanelMultiView.jsm");
const PANELS_COUNT = 2;
let gPanelAnchors = [];
let gPanels = [];
let gPanelMultiViews = [];
const PANELVIEWS_COUNT = 4;
let gPanelViews = [];
diff --git browser/components/customizableui/test/browser_PanelMultiView_focus.js browser/components/customizableui/test/browser_PanelMultiView_focus.js
--- browser/components/customizableui/test/browser_PanelMultiView_focus.js
+++ browser/components/customizableui/test/browser_PanelMultiView_focus.js
@@ -2,17 +2,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
/**
* Test the focus behavior when opening PanelViews.
*/
-ChromeUtils.import("resource:///modules/PanelMultiView.jsm");
+const {PanelMultiView} = ChromeUtils.import("resource:///modules/PanelMultiView.jsm");
let gAnchor;
let gPanel;
let gMainView;
let gMainButton;
add_task(async function setup() {
let navBar = document.getElementById("nav-bar");
diff --git browser/components/customizableui/test/browser_currentset_post_reset.js browser/components/customizableui/test/browser_currentset_post_reset.js
--- browser/components/customizableui/test/browser_currentset_post_reset.js
+++ browser/components/customizableui/test/browser_currentset_post_reset.js
@@ -1,15 +1,15 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
function checkSpacers() {
- let bsPass = ChromeUtils.import("resource:///modules/CustomizableUI.jsm", {});
+ let bsPass = ChromeUtils.import("resource:///modules/CustomizableUI.jsm", null);
let navbarWidgets = CustomizableUI.getWidgetIdsInArea("nav-bar");
let currentSetWidgets = bsPass.CustomizableUIInternal._getCurrentWidgetsInContainer(document.getElementById("nav-bar"));
navbarWidgets = navbarWidgets.filter(w => CustomizableUI.isSpecialWidget(w));
currentSetWidgets = currentSetWidgets.filter(w => CustomizableUI.isSpecialWidget(w));
Assert.deepEqual(navbarWidgets, currentSetWidgets, "Should have the same 'special' widgets in currentset and placements");
}
/**
diff --git browser/components/customizableui/test/browser_panelUINotifications.js browser/components/customizableui/test/browser_panelUINotifications.js
--- browser/components/customizableui/test/browser_panelUINotifications.js
+++ browser/components/customizableui/test/browser_panelUINotifications.js
@@ -1,11 +1,11 @@
"use strict";
-ChromeUtils.import("resource://gre/modules/AppMenuNotifications.jsm");
+const {AppMenuNotifications} = ChromeUtils.import("resource://gre/modules/AppMenuNotifications.jsm");
/**
* Tests that when we click on the main call-to-action of the doorhanger, the provided
* action is called, and the doorhanger removed.
*/
add_task(async function testMainActionCalled() {
let options = {
gBrowser: window.gBrowser,
diff --git browser/components/customizableui/test/browser_panelUINotifications_fullscreen.js browser/components/customizableui/test/browser_panelUINotifications_fullscreen.js
--- browser/components/customizableui/test/browser_panelUINotifications_fullscreen.js
+++ browser/components/customizableui/test/browser_panelUINotifications_fullscreen.js
@@ -1,11 +1,11 @@
"use strict";
-ChromeUtils.import("resource://gre/modules/AppMenuNotifications.jsm");
+const {AppMenuNotifications} = ChromeUtils.import("resource://gre/modules/AppMenuNotifications.jsm");
add_task(async function testFullscreen() {
let doc = document;
is(PanelUI.notificationPanel.state, "closed", "update-manual doorhanger is closed.");
let mainActionCalled = false;
let mainAction = {
callback: () => { mainActionCalled = true; },
diff --git browser/components/customizableui/test/browser_panelUINotifications_fullscreen_noAutoHideToolbar.js browser/components/customizableui/test/browser_panelUINotifications_fullscreen_noAutoHideToolbar.js
--- browser/components/customizableui/test/browser_panelUINotifications_fullscreen_noAutoHideToolbar.js
+++ browser/components/customizableui/test/browser_panelUINotifications_fullscreen_noAutoHideToolbar.js
@@ -1,17 +1,17 @@
"use strict";
// This test tends to trigger a race in the fullscreen time telemetry,
// where the fullscreen enter and fullscreen exit events (which use the
// same histogram ID) overlap. That causes TelemetryStopwatch to log an
// error.
SimpleTest.ignoreAllUncaughtExceptions(true);
-ChromeUtils.import("resource://gre/modules/AppMenuNotifications.jsm");
+const {AppMenuNotifications} = ChromeUtils.import("resource://gre/modules/AppMenuNotifications.jsm");
function waitForDocshellActivated() {
return ContentTask.spawn(gBrowser.selectedBrowser, null, async function() {
// Setting docshell activated/deactivated will trigger visibility state
// changes to relevant state ("visible" or "hidden"). AFAIK, there is no
// such event notifying docshell is being activated, so I use
// "visibilitychange" event rather than polling the docShell.isActive.
await ContentTaskUtils.waitForEvent(content.document, "visibilitychange",
diff --git browser/components/customizableui/test/browser_panelUINotifications_multiWindow.js browser/components/customizableui/test/browser_panelUINotifications_multiWindow.js
--- browser/components/customizableui/test/browser_panelUINotifications_multiWindow.js
+++ browser/components/customizableui/test/browser_panelUINotifications_multiWindow.js
@@ -1,11 +1,11 @@
"use strict";
-ChromeUtils.import("resource://gre/modules/AppMenuNotifications.jsm");
+const {AppMenuNotifications} = ChromeUtils.import("resource://gre/modules/AppMenuNotifications.jsm");
/**
* Tests that when we try to show a notification in a background window, it
* does not display until the window comes back into the foreground. However,
* it should display a badge.
*/
add_task(async function testDoesNotShowDoorhangerForBackgroundWindow() {
let options = {
diff --git browser/components/customizableui/test/browser_panel_keyboard_navigation.js browser/components/customizableui/test/browser_panel_keyboard_navigation.js
--- browser/components/customizableui/test/browser_panel_keyboard_navigation.js
+++ browser/components/customizableui/test/browser_panel_keyboard_navigation.js
@@ -1,15 +1,15 @@
"use strict";
/**
* Test keyboard navigation in the app menu panel.
*/
-const {PanelView} = ChromeUtils.import("resource:///modules/PanelMultiView.jsm", {});
+const {PanelView} = ChromeUtils.import("resource:///modules/PanelMultiView.jsm", null);
const kHelpButtonId = "appMenu-help-button";
function getEnabledNavigableElementsForView(panelView) {
return Array.from(panelView.querySelectorAll(
"button,toolbarbutton,menulist,.text-link"
)).filter(element => {
let bounds = element.getBoundingClientRect();
return !element.disabled && (bounds.width > 0 && bounds.height > 0);
diff --git browser/components/customizableui/test/browser_remote_tabs_button.js browser/components/customizableui/test/browser_remote_tabs_button.js
--- browser/components/customizableui/test/browser_remote_tabs_button.js
+++ browser/components/customizableui/test/browser_remote_tabs_button.js
@@ -2,17 +2,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
"use strict";
let syncService = {};
ChromeUtils.import("resource://services-sync/service.js", syncService);
const service = syncService.Service;
-const {UIState} = ChromeUtils.import("resource://services-sync/UIState.jsm", {});
+const {UIState} = ChromeUtils.import("resource://services-sync/UIState.jsm");
let getState;
let originalSync;
let syncWasCalled = false;
// TODO: This test should probably be re-written, we don't really test much here.
add_task(async function testSyncRemoteTabsButtonFunctionality() {
info("Test the Sync Remote Tabs button in the panel");
diff --git browser/components/customizableui/test/browser_synced_tabs_menu.js browser/components/customizableui/test/browser_synced_tabs_menu.js
--- browser/components/customizableui/test/browser_synced_tabs_menu.js
+++ browser/components/customizableui/test/browser_synced_tabs_menu.js
@@ -1,19 +1,19 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
requestLongerTimeout(2);
-ChromeUtils.import("resource://gre/modules/FxAccounts.jsm");
-let {SyncedTabs} = ChromeUtils.import("resource://services-sync/SyncedTabs.jsm", {});
-let {UIState} = ChromeUtils.import("resource://services-sync/UIState.jsm", {});
+const {FxAccounts} = ChromeUtils.import("resource://gre/modules/FxAccounts.jsm");
+let {SyncedTabs} = ChromeUtils.import("resource://services-sync/SyncedTabs.jsm");
+let {UIState} = ChromeUtils.import("resource://services-sync/UIState.jsm");
ChromeUtils.defineModuleGetter(this, "UITour", "resource:///modules/UITour.jsm");
// These are available on the widget implementation, but it seems impossible
// to grab that impl at runtime.
const DECKINDEX_TABS = 0;
const DECKINDEX_TABSDISABLED = 1;
const DECKINDEX_FETCHING = 2;
diff --git browser/components/distribution.js browser/components/distribution.js
--- browser/components/distribution.js
+++ browser/components/distribution.js
@@ -5,18 +5,18 @@
var EXPORTED_SYMBOLS = [ "DistributionCustomizer" ];
const DISTRIBUTION_CUSTOMIZATION_COMPLETE_TOPIC =
"distribution-customization-complete";
const PREF_CACHED_FILE_EXISTENCE = "distribution.iniFile.exists.value";
const PREF_CACHED_FILE_APPVERSION = "distribution.iniFile.exists.appversion";
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "Preferences",
"resource://gre/modules/Preferences.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
function DistributionCustomizer() {
}
diff --git browser/components/downloads/DownloadsCommon.jsm browser/components/downloads/DownloadsCommon.jsm
--- browser/components/downloads/DownloadsCommon.jsm
+++ browser/components/downloads/DownloadsCommon.jsm
@@ -27,18 +27,18 @@ var EXPORTED_SYMBOLS = [
* DownloadsIndicatorData
* This object registers itself with DownloadsData as a view, and transforms the
* notifications it receives into overall status data, that is then broadcast to
* the registered download status indicators.
*/
// Globals
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
NetUtil: "resource://gre/modules/NetUtil.jsm",
PluralForm: "resource://gre/modules/PluralForm.jsm",
AppConstants: "resource://gre/modules/AppConstants.jsm",
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
DownloadHistory: "resource://gre/modules/DownloadHistory.jsm",
Downloads: "resource://gre/modules/Downloads.jsm",
@@ -48,17 +48,17 @@ XPCOMUtils.defineLazyModuleGetters(this,
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
});
XPCOMUtils.defineLazyServiceGetters(this, {
gClipboardHelper: ["@mozilla.org/widget/clipboardhelper;1", "nsIClipboardHelper"],
});
XPCOMUtils.defineLazyGetter(this, "DownloadsLogger", () => {
- let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
+ let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
let consoleOptions = {
maxLogLevelPref: "browser.download.loglevel",
prefix: "Downloads",
};
return new ConsoleAPI(consoleOptions);
});
const kDownloadsStringBundleUrl =
diff --git browser/components/downloads/DownloadsSubview.jsm browser/components/downloads/DownloadsSubview.jsm
--- browser/components/downloads/DownloadsSubview.jsm
+++ browser/components/downloads/DownloadsSubview.jsm
@@ -3,17 +3,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = [
"DownloadsSubview",
];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm");
ChromeUtils.defineModuleGetter(this, "Downloads",
"resource://gre/modules/Downloads.jsm");
ChromeUtils.defineModuleGetter(this, "DownloadsCommon",
"resource:///modules/DownloadsCommon.jsm");
ChromeUtils.defineModuleGetter(this, "DownloadsViewUI",
diff --git browser/components/downloads/DownloadsTaskbar.jsm browser/components/downloads/DownloadsTaskbar.jsm
--- browser/components/downloads/DownloadsTaskbar.jsm
+++ browser/components/downloads/DownloadsTaskbar.jsm
@@ -11,17 +11,17 @@
"use strict";
var EXPORTED_SYMBOLS = [
"DownloadsTaskbar",
];
// Globals
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
Downloads: "resource://gre/modules/Downloads.jsm",
Services: "resource://gre/modules/Services.jsm",
});
XPCOMUtils.defineLazyGetter(this, "gWinTaskbar", function() {
if (!("@mozilla.org/windows-taskbar;1" in Cc)) {
diff --git browser/components/downloads/DownloadsViewUI.jsm browser/components/downloads/DownloadsViewUI.jsm
--- browser/components/downloads/DownloadsViewUI.jsm
+++ browser/components/downloads/DownloadsViewUI.jsm
@@ -8,17 +8,17 @@
*/
"use strict";
var EXPORTED_SYMBOLS = [
"DownloadsViewUI",
];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
Downloads: "resource://gre/modules/Downloads.jsm",
DownloadUtils: "resource://gre/modules/DownloadUtils.jsm",
DownloadsCommon: "resource:///modules/DownloadsCommon.jsm",
FileUtils: "resource://gre/modules/FileUtils.jsm",
OS: "resource://gre/modules/osfile.jsm",
diff --git browser/components/downloads/content/allDownloadsView.js browser/components/downloads/content/allDownloadsView.js
--- browser/components/downloads/content/allDownloadsView.js
+++ browser/components/downloads/content/allDownloadsView.js
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* eslint-env mozilla/browser-window */
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
Downloads: "resource://gre/modules/Downloads.jsm",
DownloadsCommon: "resource:///modules/DownloadsCommon.jsm",
DownloadsViewUI: "resource:///modules/DownloadsViewUI.jsm",
FileUtils: "resource://gre/modules/FileUtils.jsm",
NetUtil: "resource://gre/modules/NetUtil.jsm",
diff --git browser/components/downloads/content/contentAreaDownloadsView.js browser/components/downloads/content/contentAreaDownloadsView.js
--- browser/components/downloads/content/contentAreaDownloadsView.js
+++ browser/components/downloads/content/contentAreaDownloadsView.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* import-globals-from allDownloadsView.js */
-ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
+const {PrivateBrowsingUtils} = ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
var ContentAreaDownloadsView = {
init() {
let view = new DownloadsPlacesView(document.getElementById("downloadsRichListBox"));
// Do not display the Places downloads in private windows
if (!PrivateBrowsingUtils.isContentWindowPrivate(window)) {
view.place = "place:transition=7&sort=4";
}
diff --git browser/components/downloads/content/downloads.js browser/components/downloads/content/downloads.js
--- browser/components/downloads/content/downloads.js
+++ browser/components/downloads/content/downloads.js
@@ -53,17 +53,17 @@
* We end up capturing the tab/down key events, and preventing their default
* behaviour. We then set a "keyfocus" attribute on the panel, which allows
* us to draw a ring around the currently focused element. If the panel is
* closed or the mouse moves over the panel, we remove the attribute.
*/
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "DownloadsViewUI",
"resource:///modules/DownloadsViewUI.jsm");
ChromeUtils.defineModuleGetter(this, "DownloadsSubview",
"resource:///modules/DownloadsSubview.jsm");
ChromeUtils.defineModuleGetter(this, "FileUtils",
"resource://gre/modules/FileUtils.jsm");
ChromeUtils.defineModuleGetter(this, "NetUtil",
diff --git browser/components/downloads/test/browser/browser_iframe_gone_mid_download.js browser/components/downloads/test/browser/browser_iframe_gone_mid_download.js
--- browser/components/downloads/test/browser/browser_iframe_gone_mid_download.js
+++ browser/components/downloads/test/browser/browser_iframe_gone_mid_download.js
@@ -1,14 +1,14 @@
const SAVE_PER_SITE_PREF = "browser.download.lastDir.savePerSite";
function test_deleted_iframe(perSitePref, windowOptions = {}) {
return async function() {
await SpecialPowers.pushPrefEnv({ set: [[ SAVE_PER_SITE_PREF, perSitePref ]] });
- let {DownloadLastDir} = ChromeUtils.import("resource://gre/modules/DownloadLastDir.jsm", {});
+ let {DownloadLastDir} = ChromeUtils.import("resource://gre/modules/DownloadLastDir.jsm");
let win = await BrowserTestUtils.openNewBrowserWindow(windowOptions);
let tab = await BrowserTestUtils.openNewForegroundTab(win.gBrowser, "about:mozilla");
let doc = tab.linkedBrowser.contentDocument;
let iframe = doc.createElement("iframe");
doc.body.appendChild(iframe);
diff --git browser/components/enterprisepolicies/EnterprisePolicies.js browser/components/enterprisepolicies/EnterprisePolicies.js
--- browser/components/enterprisepolicies/EnterprisePolicies.js
+++ browser/components/enterprisepolicies/EnterprisePolicies.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
WindowsGPOParser: "resource:///modules/policies/WindowsGPOParser.jsm",
macOSPoliciesParser: "resource:///modules/policies/macOSPoliciesParser.jsm",
Policies: "resource:///modules/policies/Policies.jsm",
JsonSchemaValidator: "resource://gre/modules/components-utils/JsonSchemaValidator.jsm",
});
@@ -29,17 +29,17 @@ const MAGIC_TEST_ROOT_PREFIX = "<test-r
const PREF_TEST_ROOT = "mochitest.testRoot";
const PREF_LOGLEVEL = "browser.policies.loglevel";
// To force disallowing enterprise-only policies during tests
const PREF_DISALLOW_ENTERPRISE = "browser.policies.testing.disallowEnterprise";
XPCOMUtils.defineLazyGetter(this, "log", () => {
- let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
+ let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
return new ConsoleAPI({
prefix: "Enterprise Policies",
// tip: set maxLogLevel to "debug" and use log.debug() to create detailed
// messages during development. See LOG_LEVELS in Console.jsm for details.
maxLogLevel: "error",
maxLogLevelPref: PREF_LOGLEVEL,
});
});
@@ -91,17 +91,17 @@ EnterprisePoliciesManager.prototype = {
if (provider.hasPolicies) {
return provider;
}
return null;
},
_activatePolicies(unparsedPolicies) {
- let { schema } = ChromeUtils.import("resource:///modules/policies/schema.jsm", {});
+ let { schema } = ChromeUtils.import("resource:///modules/policies/schema.jsm");
for (let policyName of Object.keys(unparsedPolicies)) {
let policySchema = schema.properties[policyName];
let policyParameters = unparsedPolicies[policyName];
if (!policySchema) {
log.error(`Unknown policy: ${policyName}`);
continue;
@@ -183,18 +183,17 @@ EnterprisePoliciesManager.prototype = {
Services.ppmm.sharedData.delete("EnterprisePolicies:Status");
Services.ppmm.sharedData.delete("EnterprisePolicies:DisallowedFeatures");
this._status = Ci.nsIEnterprisePolicies.UNINITIALIZED;
for (let timing of Object.keys(this._callbacks)) {
this._callbacks[timing] = [];
}
- let { PromiseUtils } = ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm",
- {});
+ let { PromiseUtils } = ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
// Simulate the startup process. This step-by-step is a bit ugly but it
// tries to emulate the same behavior as of a normal startup.
await PromiseUtils.idleDispatch(() => {
this.observe(null, "policies-startup", null);
});
await PromiseUtils.idleDispatch(() => {
diff --git browser/components/enterprisepolicies/EnterprisePoliciesContent.js browser/components/enterprisepolicies/EnterprisePoliciesContent.js
--- browser/components/enterprisepolicies/EnterprisePoliciesContent.js
+++ browser/components/enterprisepolicies/EnterprisePoliciesContent.js
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
function EnterprisePoliciesManagerContent() {
}
EnterprisePoliciesManagerContent.prototype = {
classID: Components.ID("{dc6358f8-d167-4566-bf5b-4350b5e6a7a2}"),
QueryInterface: ChromeUtils.generateQI([Ci.nsIEnterprisePolicies]),
_xpcom_factory: XPCOMUtils.generateSingletonFactory(EnterprisePoliciesManagerContent),
diff --git browser/components/enterprisepolicies/Policies.jsm browser/components/enterprisepolicies/Policies.jsm
--- browser/components/enterprisepolicies/Policies.jsm
+++ browser/components/enterprisepolicies/Policies.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
XPCOMUtils.defineLazyServiceGetters(this, {
gCertDB: ["@mozilla.org/security/x509certdb;1", "nsIX509CertDB"],
gXulStore: ["@mozilla.org/xul/xulstore;1", "nsIXULStore"],
});
XPCOMUtils.defineLazyModuleGetters(this, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
@@ -22,17 +22,17 @@ XPCOMUtils.defineLazyModuleGetters(this,
});
XPCOMUtils.defineLazyGlobalGetters(this, ["File", "FileReader"]);
const PREF_LOGLEVEL = "browser.policies.loglevel";
const BROWSER_DOCUMENT_URL = AppConstants.BROWSER_CHROME_URL;
XPCOMUtils.defineLazyGetter(this, "log", () => {
- let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
+ let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
return new ConsoleAPI({
prefix: "Policies.jsm",
// tip: set maxLogLevel to "debug" and use log.debug() to create detailed
// messages during development. See LOG_LEVELS in Console.jsm for details.
maxLogLevel: "error",
maxLogLevelPref: PREF_LOGLEVEL,
});
});
diff --git browser/components/enterprisepolicies/WindowsGPOParser.jsm browser/components/enterprisepolicies/WindowsGPOParser.jsm
--- browser/components/enterprisepolicies/WindowsGPOParser.jsm
+++ browser/components/enterprisepolicies/WindowsGPOParser.jsm
@@ -1,20 +1,20 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
const PREF_LOGLEVEL = "browser.policies.loglevel";
XPCOMUtils.defineLazyGetter(this, "log", () => {
- let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
+ let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
return new ConsoleAPI({
prefix: "GPOParser.jsm",
// tip: set maxLogLevel to "debug" and use log.debug() to create detailed
// messages during development. See LOG_LEVELS in Console.jsm for details.
maxLogLevel: "error",
maxLogLevelPref: PREF_LOGLEVEL,
});
});
diff --git browser/components/enterprisepolicies/content/aboutPolicies.js browser/components/enterprisepolicies/content/aboutPolicies.js
--- browser/components/enterprisepolicies/content/aboutPolicies.js
+++ browser/components/enterprisepolicies/content/aboutPolicies.js
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
schema: "resource:///modules/policies/schema.jsm",
});
function col(text, className) {
let column = document.createElement("td");
if (className) {
diff --git browser/components/enterprisepolicies/helpers/BookmarksPolicies.jsm browser/components/enterprisepolicies/helpers/BookmarksPolicies.jsm
--- browser/components/enterprisepolicies/helpers/BookmarksPolicies.jsm
+++ browser/components/enterprisepolicies/helpers/BookmarksPolicies.jsm
@@ -34,26 +34,26 @@
*
*
* Note: The Policy Engine automatically converts the strings given to
* the URL and favicon properties into a URL object.
*
* The schema for this object is defined in policies-schema.json.
*/
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
const PREF_LOGLEVEL = "browser.policies.loglevel";
XPCOMUtils.defineLazyGetter(this, "log", () => {
- let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
+ let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
return new ConsoleAPI({
prefix: "BookmarksPolicies.jsm",
// tip: set maxLogLevel to "debug" and use log.debug() to create detailed
// messages during development. See LOG_LEVELS in Console.jsm for details.
maxLogLevel: "error",
maxLogLevelPref: PREF_LOGLEVEL,
});
});
diff --git browser/components/enterprisepolicies/helpers/ProxyPolicies.jsm browser/components/enterprisepolicies/helpers/ProxyPolicies.jsm
--- browser/components/enterprisepolicies/helpers/ProxyPolicies.jsm
+++ browser/components/enterprisepolicies/helpers/ProxyPolicies.jsm
@@ -1,22 +1,22 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
const PREF_LOGLEVEL = "browser.policies.loglevel";
XPCOMUtils.defineLazyGetter(this, "log", () => {
- let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
+ let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
return new ConsoleAPI({
prefix: "ProxyPolicies.jsm",
// tip: set maxLogLevel to "debug" and use log.debug() to create detailed
// messages during development. See LOG_LEVELS in Console.jsm for details.
maxLogLevel: "error",
maxLogLevelPref: PREF_LOGLEVEL,
});
});
diff --git browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm
--- browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm
+++ browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm
@@ -21,25 +21,25 @@
* Note that this module only blocks top-level website navigations. It doesn't
* block any other accesses to these urls: image tags, scripts, XHR, etc.,
* because that could cause unexpected breakage. This is a policy to block
* users from visiting certain websites, and not from blocking any network
* connections to those websites. If the admin is looking for that, the recommended
* way is to configure that with extensions or through a company firewall.
*/
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const LIST_LENGTH_LIMIT = 1000;
const PREF_LOGLEVEL = "browser.policies.loglevel";
XPCOMUtils.defineLazyGetter(this, "log", () => {
- let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
+ let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
return new ConsoleAPI({
prefix: "WebsiteFilter Policy",
// tip: set maxLogLevel to "debug" and use log.debug() to create detailed
// messages during development. See LOG_LEVELS in Console.jsm for details.
maxLogLevel: "error",
maxLogLevelPref: PREF_LOGLEVEL,
});
});
diff --git browser/components/enterprisepolicies/macOSPoliciesParser.jsm browser/components/enterprisepolicies/macOSPoliciesParser.jsm
--- browser/components/enterprisepolicies/macOSPoliciesParser.jsm
+++ browser/components/enterprisepolicies/macOSPoliciesParser.jsm
@@ -1,20 +1,20 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
const PREF_LOGLEVEL = "browser.policies.loglevel";
XPCOMUtils.defineLazyGetter(this, "log", () => {
- let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
+ let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
return new ConsoleAPI({
prefix: "macOSPoliciesParser.jsm",
// tip: set maxLogLevel to "debug" and use log.debug() to create detailed
// messages during development. See LOG_LEVELS in Console.jsm for details.
maxLogLevel: "error",
maxLogLevelPref: PREF_LOGLEVEL,
});
});
@@ -36,17 +36,17 @@ var macOSPoliciesParser = {
if (log.maxLogLevel == "debug") {
log.debug(JSON.stringify(nativePolicies, null, 2));
}
return nativePolicies;
},
removeUnknownPolicies(policies) {
- let { schema } = ChromeUtils.import("resource:///modules/policies/schema.jsm", {});
+ let { schema } = ChromeUtils.import("resource:///modules/policies/schema.jsm");
for (let policyName of Object.keys(policies)) {
if (!schema.properties.hasOwnProperty(policyName)) {
log.debug(`Removing unknown policy: ${policyName}`);
delete policies[policyName];
}
}
diff --git browser/components/enterprisepolicies/tests/EnterprisePolicyTesting.jsm browser/components/enterprisepolicies/tests/EnterprisePolicyTesting.jsm
--- browser/components/enterprisepolicies/tests/EnterprisePolicyTesting.jsm
+++ browser/components/enterprisepolicies/tests/EnterprisePolicyTesting.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Preferences.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/osfile.jsm");
-ChromeUtils.import("resource://testing-common/Assert.jsm");
+const {Preferences} = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
+const {Assert} = ChromeUtils.import("resource://testing-common/Assert.jsm");
ChromeUtils.defineModuleGetter(this, "FileTestUtils",
"resource://testing-common/FileTestUtils.jsm");
var EXPORTED_SYMBOLS = ["EnterprisePolicyTesting", "PoliciesPrefTracker"];
var EnterprisePolicyTesting = {
// |json| must be an object representing the desired policy configuration, OR a
// path to the JSON file containing the policy configuration.
@@ -38,17 +38,17 @@ var EnterprisePolicyTesting = {
resolve();
}, "EnterprisePolicies:AllPoliciesApplied");
});
// Clear any previously used custom schema
Cu.unload("resource:///modules/policies/schema.jsm");
if (customSchema) {
- let schemaModule = ChromeUtils.import("resource:///modules/policies/schema.jsm", {});
+ let schemaModule = ChromeUtils.import("resource:///modules/policies/schema.jsm", null);
schemaModule.schema = customSchema;
}
Services.obs.notifyObservers(null, "EnterprisePolicies:Restart");
return promise;
},
checkPolicyPref(prefName, expectedValue, expectedLockedness) {
@@ -80,25 +80,25 @@ var EnterprisePolicyTesting = {
* that they are restored to their original values when
* the test ends or another test case restarts the engine.
*/
var PoliciesPrefTracker = {
_originalFunc: null,
_originalValues: new Map(),
start() {
- let PoliciesBackstage = ChromeUtils.import("resource:///modules/policies/Policies.jsm", {});
+ let PoliciesBackstage = ChromeUtils.import("resource:///modules/policies/Policies.jsm", null);
this._originalFunc = PoliciesBackstage.setDefaultPref;
PoliciesBackstage.setDefaultPref = this.hoistedSetDefaultPref.bind(this);
},
stop() {
this.restoreDefaultValues();
- let PoliciesBackstage = ChromeUtils.import("resource:///modules/policies/Policies.jsm", {});
+ let PoliciesBackstage = ChromeUtils.import("resource:///modules/policies/Policies.jsm", null);
PoliciesBackstage.setDefaultPref = this._originalFunc;
this._originalFunc = null;
},
hoistedSetDefaultPref(prefName, prefValue) {
// If this pref is seen multiple times, the very first
// value seen is the one that is actually the default.
if (!this._originalValues.has(prefName)) {
diff --git browser/components/enterprisepolicies/tests/browser/browser_policies_basic_tests.js browser/components/enterprisepolicies/tests/browser/browser_policies_basic_tests.js
--- browser/components/enterprisepolicies/tests/browser/browser_policies_basic_tests.js
+++ browser/components/enterprisepolicies/tests/browser/browser_policies_basic_tests.js
@@ -1,15 +1,15 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
add_task(async function test_simple_policies() {
- let { Policies } = ChromeUtils.import("resource:///modules/policies/Policies.jsm", {});
+ let { Policies } = ChromeUtils.import("resource:///modules/policies/Policies.jsm");
let policy0Ran = false, policy1Ran = false, policy2Ran = false, policy3Ran = false;
// Implement functions to handle the four simple policies that will be added
// to the schema.
Policies.simple_policy0 = {
onProfileAfterChange(manager, param) {
is(param, true, "Param matches what was passed in config file");
diff --git browser/components/enterprisepolicies/tests/browser/browser_policies_enterprise_only.js browser/components/enterprisepolicies/tests/browser/browser_policies_enterprise_only.js
--- browser/components/enterprisepolicies/tests/browser/browser_policies_enterprise_only.js
+++ browser/components/enterprisepolicies/tests/browser/browser_policies_enterprise_only.js
@@ -1,17 +1,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const PREF_DISALLOW_ENTERPRISE = "browser.policies.testing.disallowEnterprise";
add_task(async function test_enterprise_only_policies() {
- let { Policies } = ChromeUtils.import("resource:///modules/policies/Policies.jsm", {});
+ let { Policies } = ChromeUtils.import("resource:///modules/policies/Policies.jsm");
let normalPolicyRan = false, enterprisePolicyRan = false;
Policies.NormalPolicy = {
onProfileAfterChange(manager, param) {
normalPolicyRan = true;
},
};
diff --git browser/components/enterprisepolicies/tests/browser/browser_policies_macosparser_unflatten.js browser/components/enterprisepolicies/tests/browser/browser_policies_macosparser_unflatten.js
--- browser/components/enterprisepolicies/tests/browser/browser_policies_macosparser_unflatten.js
+++ browser/components/enterprisepolicies/tests/browser/browser_policies_macosparser_unflatten.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-let { macOSPoliciesParser } = ChromeUtils.import("resource:///modules/policies/macOSPoliciesParser.jsm", {});
+let { macOSPoliciesParser } = ChromeUtils.import("resource:///modules/policies/macOSPoliciesParser.jsm");
add_task(async function test_object_unflatten() {
// Note: these policies are just examples and they won't actually
// run through the policy engine on this test. We're just testing
// that the unflattening algorithm produces the correct output.
let input = {
"DisplayBookmarksToolbar": true,
diff --git browser/components/enterprisepolicies/tests/browser/browser_policies_runOnce_helper.js browser/components/enterprisepolicies/tests/browser/browser_policies_runOnce_helper.js
--- browser/components/enterprisepolicies/tests/browser/browser_policies_runOnce_helper.js
+++ browser/components/enterprisepolicies/tests/browser/browser_policies_runOnce_helper.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-let { runOnce } = ChromeUtils.import("resource:///modules/policies/Policies.jsm", {});
+let { runOnce } = ChromeUtils.import("resource:///modules/policies/Policies.jsm", null);
let runCount = 0;
function callback() {
runCount++;
}
add_task(async function test_runonce_helper() {
runOnce("test_action", callback);
diff --git browser/components/enterprisepolicies/tests/browser/browser_policies_setAndLockPref_API.js browser/components/enterprisepolicies/tests/browser/browser_policies_setAndLockPref_API.js
--- browser/components/enterprisepolicies/tests/browser/browser_policies_setAndLockPref_API.js
+++ browser/components/enterprisepolicies/tests/browser/browser_policies_setAndLockPref_API.js
@@ -2,17 +2,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
let {
Policies,
setAndLockPref,
setDefaultPref,
-} = ChromeUtils.import("resource:///modules/policies/Policies.jsm", {});
+} = ChromeUtils.import("resource:///modules/policies/Policies.jsm", null);
add_task(async function test_API_directly() {
await setupPolicyEngineWithJson("");
setAndLockPref("policies.test.boolPref", true);
checkLockedPref("policies.test.boolPref", true);
// Check that a previously-locked pref can be changed
// (it will be unlocked first).
diff --git browser/components/enterprisepolicies/tests/browser/browser_policies_sorted_alphabetically.js browser/components/enterprisepolicies/tests/browser/browser_policies_sorted_alphabetically.js
--- browser/components/enterprisepolicies/tests/browser/browser_policies_sorted_alphabetically.js
+++ browser/components/enterprisepolicies/tests/browser/browser_policies_sorted_alphabetically.js
@@ -12,19 +12,19 @@ function checkArrayIsSorted(array, msg)
sorted = false;
break;
}
}
ok(sorted, msg);
}
add_task(async function test_policies_sorted() {
- let { schema } = ChromeUtils.import("resource:///modules/policies/schema.jsm", {});
- let { Policies } = ChromeUtils.import("resource:///modules/policies/Policies.jsm", {});
+ let { schema } = ChromeUtils.import("resource:///modules/policies/schema.jsm");
+ let { Policies } = ChromeUtils.import("resource:///modules/policies/Policies.jsm");
checkArrayIsSorted(Object.keys(schema.properties), "policies-schema.json is alphabetically sorted.");
checkArrayIsSorted(Object.keys(Policies), "Policies.jsm is alphabetically sorted.");
});
add_task(async function check_naming_conventions() {
- let { schema } = ChromeUtils.import("resource:///modules/policies/schema.jsm", {});
+ let { schema } = ChromeUtils.import("resource:///modules/policies/schema.jsm");
is(Object.keys(schema.properties).some(key => key.includes("__")), false, "Can't use __ in a policy name as it's used as a delimiter");
});
diff --git browser/components/enterprisepolicies/tests/browser/browser_policy_bookmarks.js browser/components/enterprisepolicies/tests/browser/browser_policy_bookmarks.js
--- browser/components/enterprisepolicies/tests/browser/browser_policy_bookmarks.js
+++ browser/components/enterprisepolicies/tests/browser/browser_policy_bookmarks.js
@@ -1,19 +1,19 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {PlacesUtils} = ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
const FAVICON_DATA = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gwMDAsTBZbkNwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAABNElEQVQ4y8WSsU0DURBE3yyWIaAJaqAAN4DPSL6AlIACKIEOyJEgRsIgOOkiInJqgAKowNg7BHdn7MOksNl+zZ//dvbDf5cAiklp22BdVtXdeTEpDYDB9m1VzU6OJuVp2NdEQCaI96fH2YHG4+mDduKYNMYINTcjcGbXzQVDEAphG0k48zUsajIbnAiMIXThpW8EICE0RAK4dvoKg9NIcTiQ589otyHOZLnwqK5nLwBFUZ4igc3iM0d1ff8CMC6mZ6Ihiaqq3gi1aUAnArD00SW1fq5OLBg0ymYmSZsR2/t4e/rGyCLW0sbp3oq+yTYqVgytQWui2FS7XYF7GFprY921T4CNQt8zr47dNzCkIX7y/jBtH+v+RGMQrc828W8pApnZbmEVQp/Ae7BlOy2ttib81/UFc+WRWEbjckIAAAAASUVORK5CYII=";
-const { BookmarksPolicies } = ChromeUtils.import("resource:///modules/policies/BookmarksPolicies.jsm", {});
+const { BookmarksPolicies } = ChromeUtils.import("resource:///modules/policies/BookmarksPolicies.jsm");
let CURRENT_POLICY;
const BASE_POLICY = {
"policies": {
"DisplayBookmarksToolbar": true,
"Bookmarks": [
{
diff --git browser/components/enterprisepolicies/tests/browser/browser_policy_cookie_settings.js browser/components/enterprisepolicies/tests/browser/browser_policy_cookie_settings.js
--- browser/components/enterprisepolicies/tests/browser/browser_policy_cookie_settings.js
+++ browser/components/enterprisepolicies/tests/browser/browser_policy_cookie_settings.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm", {});
-const {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
+const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm");
XPCOMUtils.defineLazyServiceGetter(Services, "cookies",
"@mozilla.org/cookieService;1",
"nsICookieService");
XPCOMUtils.defineLazyServiceGetter(Services, "cookiemgr",
"@mozilla.org/cookiemanager;1",
"nsICookieManager");
function restore_prefs() {
diff --git browser/components/enterprisepolicies/tests/browser/browser_policy_default_browser_check.js browser/components/enterprisepolicies/tests/browser/browser_policy_default_browser_check.js
--- browser/components/enterprisepolicies/tests/browser/browser_policy_default_browser_check.js
+++ browser/components/enterprisepolicies/tests/browser/browser_policy_default_browser_check.js
@@ -1,13 +1,13 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { ShellService } = ChromeUtils.import("resource:///modules/ShellService.jsm", {});
+const { ShellService } = ChromeUtils.import("resource:///modules/ShellService.jsm");
add_task(async function test_default_browser_check() {
ShellService._checkedThisSession = false;
// On a normal profile, the default is true. However, this gets set to false on the
// testing profile. Let's start with true for a sanity check.
ShellService.shouldCheckDefaultBrowser = true;
is(ShellService.shouldCheckDefaultBrowser, true, "Sanity check");
diff --git browser/components/enterprisepolicies/tests/browser/browser_policy_disable_privatebrowsing.js browser/components/enterprisepolicies/tests/browser/browser_policy_disable_privatebrowsing.js
--- browser/components/enterprisepolicies/tests/browser/browser_policy_disable_privatebrowsing.js
+++ browser/components/enterprisepolicies/tests/browser/browser_policy_disable_privatebrowsing.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
+const {PrivateBrowsingUtils} = ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
add_task(async function setup() {
await setupPolicyEngineWithJson({
"policies": {
"DisablePrivateBrowsing": true,
},
});
});
diff --git browser/components/enterprisepolicies/tests/browser/browser_policy_disable_profile_reset.js browser/components/enterprisepolicies/tests/browser/browser_policy_disable_profile_reset.js
--- browser/components/enterprisepolicies/tests/browser/browser_policy_disable_profile_reset.js
+++ browser/components/enterprisepolicies/tests/browser/browser_policy_disable_profile_reset.js
@@ -1,13 +1,13 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-let {ResetProfile} = ChromeUtils.import("resource://gre/modules/ResetProfile.jsm", {});
+let {ResetProfile} = ChromeUtils.import("resource://gre/modules/ResetProfile.jsm");
// For this test to work properly, this profile actually needs to be
// "reset-able", which requires that it be recognized by the profile service
add_task(async function setup() {
let profileDirectory = Services.dirsvc.get("ProfD", Ci.nsIFile);
let profileName = profileDirectory.leafName;
let profileService = Cc["@mozilla.org/toolkit/profile-service;1"].
getService(Ci.nsIToolkitProfileService);
diff --git browser/components/enterprisepolicies/tests/browser/browser_policy_disable_shield.js browser/components/enterprisepolicies/tests/browser/browser_policy_disable_shield.js
--- browser/components/enterprisepolicies/tests/browser/browser_policy_disable_shield.js
+++ browser/components/enterprisepolicies/tests/browser/browser_policy_disable_shield.js
@@ -1,15 +1,15 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
add_task(async function test_policy_disable_shield() {
- const { RecipeRunner } = ChromeUtils.import("resource://normandy/lib/RecipeRunner.jsm", {});
+ const { RecipeRunner } = ChromeUtils.import("resource://normandy/lib/RecipeRunner.jsm");
await SpecialPowers.pushPrefEnv({ set: [["app.normandy.api_url",
"https://localhost/selfsupport-dummy/"],
["datareporting.healthreport.uploadEnabled",
true]]});
ok(RecipeRunner, "RecipeRunner exists");
RecipeRunner.checkPrefs();
diff --git browser/components/enterprisepolicies/tests/browser/browser_policy_disable_telemetry.js browser/components/enterprisepolicies/tests/browser/browser_policy_disable_telemetry.js
--- browser/components/enterprisepolicies/tests/browser/browser_policy_disable_telemetry.js
+++ browser/components/enterprisepolicies/tests/browser/browser_policy_disable_telemetry.js
@@ -1,15 +1,15 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
add_task(async function test_policy_disable_telemetry() {
- const { TelemetryReportingPolicy } = ChromeUtils.import("resource://gre/modules/TelemetryReportingPolicy.jsm", {});
+ const { TelemetryReportingPolicy } = ChromeUtils.import("resource://gre/modules/TelemetryReportingPolicy.jsm");
ok(TelemetryReportingPolicy, "TelemetryReportingPolicy exists");
is(TelemetryReportingPolicy.canUpload(), true, "Telemetry is enabled");
await setupPolicyEngineWithJson({
"policies": {
"DisableTelemetry": true,
},
diff --git browser/components/enterprisepolicies/tests/browser/browser_policy_proxy.js browser/components/enterprisepolicies/tests/browser/browser_policy_proxy.js
--- browser/components/enterprisepolicies/tests/browser/browser_policy_proxy.js
+++ browser/components/enterprisepolicies/tests/browser/browser_policy_proxy.js
@@ -3,17 +3,17 @@
"use strict";
add_task(async function test_proxy_modes_and_autoconfig() {
// Directly test the proxy Mode and AutoconfigURL parameters through
// the API instead of the policy engine, because the test harness
// uses these prefs, and changing them interfere with the harness.
// Checks that every Mode value translates correctly to the expected pref value
- let { ProxyPolicies, PROXY_TYPES_MAP } = ChromeUtils.import("resource:///modules/policies/ProxyPolicies.jsm", {});
+ let { ProxyPolicies, PROXY_TYPES_MAP } = ChromeUtils.import("resource:///modules/policies/ProxyPolicies.jsm", null);
for (let [mode, expectedValue] of PROXY_TYPES_MAP) {
ProxyPolicies.configureProxySettings({Mode: mode}, (_, value) => {
is(value, expectedValue, "Correct proxy mode");
});
}
let autoconfigURL = new URL("data:text/plain,test");
diff --git browser/components/enterprisepolicies/tests/browser/head.js browser/components/enterprisepolicies/tests/browser/head.js
--- browser/components/enterprisepolicies/tests/browser/head.js
+++ browser/components/enterprisepolicies/tests/browser/head.js
@@ -2,17 +2,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const {
EnterprisePolicyTesting,
PoliciesPrefTracker,
-} = ChromeUtils.import("resource://testing-common/EnterprisePolicyTesting.jsm", {});
+} = ChromeUtils.import("resource://testing-common/EnterprisePolicyTesting.jsm", null);
PoliciesPrefTracker.start();
async function setupPolicyEngineWithJson(json, customSchema) {
PoliciesPrefTracker.restoreDefaultValues();
if (typeof(json) != "object") {
let filePath = getTestFilePath(json ? json : "non-existing-file.json");
return EnterprisePolicyTesting.setupPolicyEngineWithJson(filePath, customSchema);
diff --git browser/components/extensions/ExtensionControlledPopup.jsm browser/components/extensions/ExtensionControlledPopup.jsm
--- browser/components/extensions/ExtensionControlledPopup.jsm
+++ browser/components/extensions/ExtensionControlledPopup.jsm
@@ -14,19 +14,19 @@
* The original purpose of the popup was to notify users of an extension that has
* changed the New Tab or homepage. Users would see this popup the first time they
* view those pages after a change to the setting in each session until they confirm
* the change by triggering the primary action.
*/
var EXPORTED_SYMBOLS = ["ExtensionControlledPopup"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/ExtensionCommon.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {ExtensionCommon} = ChromeUtils.import("resource://gre/modules/ExtensionCommon.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "AddonManager",
"resource://gre/modules/AddonManager.jsm");
ChromeUtils.defineModuleGetter(this, "BrowserUtils",
"resource://gre/modules/BrowserUtils.jsm");
ChromeUtils.defineModuleGetter(this, "CustomizableUI",
"resource:///modules/CustomizableUI.jsm");
ChromeUtils.defineModuleGetter(this, "ExtensionSettingsStore",
diff --git browser/components/extensions/ExtensionPopups.jsm browser/components/extensions/ExtensionPopups.jsm
--- browser/components/extensions/ExtensionPopups.jsm
+++ browser/components/extensions/ExtensionPopups.jsm
@@ -1,30 +1,30 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
/* exported PanelPopup, ViewPopup */
var EXPORTED_SYMBOLS = ["BasePopup", "PanelPopup", "ViewPopup"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "CustomizableUI",
"resource:///modules/CustomizableUI.jsm");
ChromeUtils.defineModuleGetter(this, "E10SUtils",
"resource://gre/modules/E10SUtils.jsm");
ChromeUtils.defineModuleGetter(this, "ExtensionParent",
"resource://gre/modules/ExtensionParent.jsm");
ChromeUtils.defineModuleGetter(this, "setTimeout",
"resource://gre/modules/Timer.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/ExtensionCommon.jsm");
-ChromeUtils.import("resource://gre/modules/ExtensionUtils.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {ExtensionCommon} = ChromeUtils.import("resource://gre/modules/ExtensionCommon.jsm");
+const {ExtensionUtils} = ChromeUtils.import("resource://gre/modules/ExtensionUtils.jsm");
var {
DefaultWeakMap,
promiseEvent,
} = ExtensionUtils;
const {
makeWidgetId,
diff --git browser/components/extensions/child/ext-devtools-panels.js browser/components/extensions/child/ext-devtools-panels.js
--- browser/components/extensions/child/ext-devtools-panels.js
+++ browser/components/extensions/child/ext-devtools-panels.js
@@ -1,13 +1,13 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
ChromeUtils.defineModuleGetter(this, "ExtensionChildDevToolsUtils",
"resource://gre/modules/ExtensionChildDevToolsUtils.jsm");
var {
promiseDocumentLoaded,
diff --git browser/components/extensions/parent/ext-bookmarks.js browser/components/extensions/parent/ext-bookmarks.js
--- browser/components/extensions/parent/ext-bookmarks.js
+++ browser/components/extensions/parent/ext-bookmarks.js
@@ -1,13 +1,13 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
+var {PlacesUtils} = ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
const {
TYPE_BOOKMARK,
TYPE_FOLDER,
TYPE_SEPARATOR,
} = PlacesUtils.bookmarks;
const BOOKMARKS_TYPES_TO_API_TYPES_MAP = new Map([
diff --git browser/components/extensions/parent/ext-browserAction.js browser/components/extensions/parent/ext-browserAction.js
--- browser/components/extensions/parent/ext-browserAction.js
+++ browser/components/extensions/parent/ext-browserAction.js
@@ -13,17 +13,17 @@ ChromeUtils.defineModuleGetter(this, "se
ChromeUtils.defineModuleGetter(this, "ViewPopup",
"resource:///modules/ExtensionPopups.jsm");
var {
DefaultWeakMap,
ExtensionError,
} = ExtensionUtils;
-ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
+var {ExtensionParent} = ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
var {
IconDetails,
StartupCache,
} = ExtensionParent;
XPCOMUtils.defineLazyGlobalGetters(this, ["InspectorUtils"]);
diff --git browser/components/extensions/parent/ext-devtools-panels.js browser/components/extensions/parent/ext-devtools-panels.js
--- browser/components/extensions/parent/ext-devtools-panels.js
+++ browser/components/extensions/parent/ext-devtools-panels.js
@@ -1,13 +1,13 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
+var {ExtensionParent} = ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
var {
IconDetails,
watchExtensionProxyContextLoad,
} = ExtensionParent;
var {
promiseDocumentLoaded,
diff --git browser/components/extensions/parent/ext-devtools.js browser/components/extensions/parent/ext-devtools.js
--- browser/components/extensions/parent/ext-devtools.js
+++ browser/components/extensions/parent/ext-devtools.js
@@ -5,17 +5,17 @@
/**
* This module provides helpers used by the other specialized `ext-devtools-*.js` modules
* and the implementation of the `devtools_page`.
*/
ChromeUtils.defineModuleGetter(this, "DevToolsShim",
"chrome://devtools-startup/content/DevToolsShim.jsm");
-ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
+var {ExtensionParent} = ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
var {
HiddenExtensionPage,
watchExtensionProxyContextLoad,
} = ExtensionParent;
// Get the devtools preference given the extension id.
function getDevToolsPrefBranchName(extensionId) {
diff --git browser/components/extensions/parent/ext-geckoProfiler.js browser/components/extensions/parent/ext-geckoProfiler.js
--- browser/components/extensions/parent/ext-geckoProfiler.js
+++ browser/components/extensions/parent/ext-geckoProfiler.js
@@ -1,13 +1,13 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["TextEncoder", "TextDecoder"]);
ChromeUtils.defineModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
ChromeUtils.defineModuleGetter(this, "Subprocess", "resource://gre/modules/Subprocess.jsm");
const PREF_ASYNC_STACK = "javascript.options.asyncstack";
const PREF_GET_SYMBOL_RULES = "extensions.geckoProfiler.getSymbolRules";
diff --git browser/components/extensions/parent/ext-menus.js browser/components/extensions/parent/ext-menus.js
--- browser/components/extensions/parent/ext-menus.js
+++ browser/components/extensions/parent/ext-menus.js
@@ -1,20 +1,20 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var {
DefaultMap,
ExtensionError,
} = ExtensionUtils;
-ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
+var {ExtensionParent} = ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
var {
IconDetails,
} = ExtensionParent;
const ACTION_MENU_TOP_LEVEL_LIMIT = 6;
// Map[Extension -> Map[ID -> MenuItem]]
diff --git browser/components/extensions/parent/ext-pageAction.js browser/components/extensions/parent/ext-pageAction.js
--- browser/components/extensions/parent/ext-pageAction.js
+++ browser/components/extensions/parent/ext-pageAction.js
@@ -4,17 +4,17 @@
ChromeUtils.defineModuleGetter(this, "ExtensionTelemetry",
"resource://gre/modules/ExtensionTelemetry.jsm");
ChromeUtils.defineModuleGetter(this, "PageActions",
"resource:///modules/PageActions.jsm");
ChromeUtils.defineModuleGetter(this, "PanelPopup",
"resource:///modules/ExtensionPopups.jsm");
-ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
+var {ExtensionParent} = ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
var {
IconDetails,
StartupCache,
} = ExtensionParent;
var {
DefaultWeakMap,
diff --git browser/components/extensions/parent/ext-sidebarAction.js browser/components/extensions/parent/ext-sidebarAction.js
--- browser/components/extensions/parent/ext-sidebarAction.js
+++ browser/components/extensions/parent/ext-sidebarAction.js
@@ -1,13 +1,13 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
+var {ExtensionParent} = ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
var {
ExtensionError,
} = ExtensionUtils;
var {
IconDetails,
} = ExtensionParent;
diff --git browser/components/extensions/test/browser/browser_ext_browserAction_context.js browser/components/extensions/test/browser/browser_ext_browserAction_context.js
--- browser/components/extensions/test/browser/browser_ext_browserAction_context.js
+++ browser/components/extensions/test/browser/browser_ext_browserAction_context.js
@@ -843,17 +843,17 @@ add_task(async function testDefaultBadge
});
});
add_task(async function testNavigationClearsData() {
let url = "http://example.com/";
let default_title = "Default title";
let tab_title = "Tab title";
- let {Management: {global: {tabTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ let {Management: {global: {tabTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
let extension, tabs = [];
async function addTab(...args) {
let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, ...args);
tabs.push(tab);
return tab;
}
async function sendMessage(method, param, expect, msg) {
extension.sendMessage({method, param, expect, msg});
diff --git browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload.js browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload.js
--- browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload.js
+++ browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload.js
@@ -22,17 +22,17 @@ add_task(async function testBrowserActio
files: {
"popup.html": `<!DOCTYPE html><html><head><meta charset="utf-8"></head></html>`,
},
});
await extension.startup();
- const {GlobalManager, Management: {global: {browserActionFor}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ const {GlobalManager, Management: {global: {browserActionFor}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
let ext = GlobalManager.extensionMap.get(extension.id);
let browserAction = browserActionFor(ext);
let widget = getBrowserActionWidget(extension).forWindow(window);
// Test canceled click.
EventUtils.synthesizeMouseAtCenter(widget.node, {type: "mousedown", button: 0}, window);
@@ -110,17 +110,17 @@ add_task(async function testBrowserActio
},
});
await extension.startup();
await extension.awaitMessage("browserAction-disabled");
await promiseAnimationFrame();
- const {GlobalManager, Management: {global: {browserActionFor}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ const {GlobalManager, Management: {global: {browserActionFor}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
let ext = GlobalManager.extensionMap.get(extension.id);
let browserAction = browserActionFor(ext);
let widget = getBrowserActionWidget(extension).forWindow(window);
is(widget.node.getAttribute("disabled"), "true", "Button is disabled");
is(browserAction.pendingPopup, null, "Have no pending popup prior to click");
diff --git browser/components/extensions/test/browser/browser_ext_commands_onCommand.js browser/components/extensions/test/browser/browser_ext_commands_onCommand.js
--- browser/components/extensions/test/browser/browser_ext_commands_onCommand.js
+++ browser/components/extensions/test/browser/browser_ext_commands_onCommand.js
@@ -1,13 +1,13 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
add_task(async function test_user_defined_commands() {
const testCommands = [
// Ctrl Shortcuts
{
name: "toggle-ctrl-a",
shortcut: "Ctrl+A",
key: "A",
diff --git browser/components/extensions/test/browser/browser_ext_currentWindow.js browser/components/extensions/test/browser/browser_ext_currentWindow.js
--- browser/components/extensions/test/browser/browser_ext_currentWindow.js
+++ browser/components/extensions/test/browser/browser_ext_currentWindow.js
@@ -85,17 +85,17 @@ add_task(async function() {
"popup.js": genericChecker,
},
background: genericChecker,
});
await Promise.all([extension.startup(), extension.awaitMessage("background-ready")]);
- let {Management: {global: {windowTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ let {Management: {global: {windowTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
let winId1 = windowTracker.getId(win1);
let winId2 = windowTracker.getId(win2);
async function checkWindow(kind, winId, name) {
extension.sendMessage(kind + "-check-current1");
is((await extension.awaitMessage("result")), winId, `${name} is on top (check 1) [${kind}]`);
extension.sendMessage(kind + "-check-current2");
diff --git browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow.js browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow.js
--- browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow.js
+++ browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow.js
@@ -1,13 +1,13 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {gDevTools} = require("devtools/client/framework/devtools");
/**
* Helper that returns the id of the last additional/extension tool for a provided
* toolbox.
*
* @param {Object} toolbox
* The DevTools toolbox object.
diff --git browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_eval_bindings.js browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_eval_bindings.js
--- browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_eval_bindings.js
+++ browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_eval_bindings.js
@@ -1,13 +1,13 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {gDevTools} = require("devtools/client/framework/devtools");
/**
* this test file ensures that:
*
* - devtools.inspectedWindow.eval provides the expected $0 and inspect bindings
*/
add_task(async function test_devtools_inspectedWindow_eval_bindings() {
diff --git browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_reload.js browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_reload.js
--- browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_reload.js
+++ browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_reload.js
@@ -1,17 +1,17 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
// Like most of the mochitest-browser devtools test,
// on debug test slave, it takes about 50s to run the test.
requestLongerTimeout(4);
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {gDevTools} = require("devtools/client/framework/devtools");
// Small helper which provides the common steps to the following reload test cases.
async function runReloadTestCase({urlParams, background, devtoolsPage, testCase}) {
const BASE = "http://mochi.test:8888/browser/browser/components/extensions/test/browser/";
const TEST_TARGET_URL = `${BASE}file_inspectedwindow_reload_target.sjs?${urlParams}`;
let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_TARGET_URL);
diff --git browser/components/extensions/test/browser/browser_ext_devtools_network.js browser/components/extensions/test/browser/browser_ext_devtools_network.js
--- browser/components/extensions/test/browser/browser_ext_devtools_network.js
+++ browser/components/extensions/test/browser/browser_ext_devtools_network.js
@@ -1,13 +1,13 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {gDevTools} = require("devtools/client/framework/devtools");
function background() {
browser.test.onMessage.addListener(msg => {
let code;
if (msg === "navigate") {
code = "window.wrappedJSObject.location.href = 'http://example.com/';";
browser.tabs.executeScript({code});
diff --git browser/components/extensions/test/browser/browser_ext_devtools_page.js browser/components/extensions/test/browser/browser_ext_devtools_page.js
--- browser/components/extensions/test/browser/browser_ext_devtools_page.js
+++ browser/components/extensions/test/browser/browser_ext_devtools_page.js
@@ -1,13 +1,13 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {gDevTools} = require("devtools/client/framework/devtools");
/**
* This test file ensures that:
*
* - the devtools_page property creates a new WebExtensions context
* - the devtools_page can exchange messages with the background page
*/
diff --git browser/components/extensions/test/browser/browser_ext_devtools_panel.js browser/components/extensions/test/browser/browser_ext_devtools_panel.js
--- browser/components/extensions/test/browser/browser_ext_devtools_panel.js
+++ browser/components/extensions/test/browser/browser_ext_devtools_panel.js
@@ -4,17 +4,17 @@
// Like most of the mochitest-browser devtools test,
// on debug test slave, it takes about 50s to run the test.
requestLongerTimeout(4);
ChromeUtils.defineModuleGetter(this, "Preferences",
"resource://gre/modules/Preferences.jsm");
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {gDevTools} = require("devtools/client/framework/devtools");
const DEVTOOLS_THEME_PREF = "devtools.theme";
/**
* This test file ensures that:
*
* - devtools.panels.themeName returns the correct value,
diff --git browser/components/extensions/test/browser/browser_ext_getViews.js browser/components/extensions/test/browser/browser_ext_getViews.js
--- browser/components/extensions/test/browser/browser_ext_getViews.js
+++ browser/components/extensions/test/browser/browser_ext_getViews.js
@@ -122,17 +122,17 @@ add_task(async function() {
background: genericChecker,
});
await Promise.all([extension.startup(), extension.awaitMessage("background-ready")]);
info("started");
- let {Management: {global: {windowTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ let {Management: {global: {windowTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
let winId1 = windowTracker.getId(win1);
let winId2 = windowTracker.getId(win2);
async function openTab(winId) {
extension.sendMessage("background-open-tab", winId);
await extension.awaitMessage("tab-ready");
return extension.awaitMessage("opened-tab");
diff --git browser/components/extensions/test/browser/browser_ext_menus_events.js browser/components/extensions/test/browser/browser_ext_menus_events.js
--- browser/components/extensions/test/browser/browser_ext_menus_events.js
+++ browser/components/extensions/test/browser/browser_ext_menus_events.js
@@ -5,18 +5,18 @@
const PAGE = "http://mochi.test:8888/browser/browser/components/extensions/test/browser/context.html";
const PAGE_BASE = PAGE.replace("context.html", "");
const PAGE_HOST_PATTERN = "http://mochi.test/*";
const EXPECT_TARGET_ELEMENT = 13337;
async function grantOptionalPermission(extension, permissions) {
- const {GlobalManager} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
- const {ExtensionPermissions} = ChromeUtils.import("resource://gre/modules/ExtensionPermissions.jsm", {});
+ const {GlobalManager} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
+ const {ExtensionPermissions} = ChromeUtils.import("resource://gre/modules/ExtensionPermissions.jsm");
let ext = GlobalManager.extensionMap.get(extension.id);
return ExtensionPermissions.add(ext, permissions);
}
// Registers a context menu using menus.create(menuCreateParams) and checks
// whether the menus.onShown and menus.onHidden events are fired as expected.
// doOpenMenu must open the menu and its returned promise must resolve after the
// menu is shown. Similarly, doCloseMenu must hide the menu.
@@ -418,17 +418,17 @@ add_task(async function test_show_hide_f
editable: false,
get frameId() { return frameId; },
pageUrl: PAGE,
frameUrl: PAGE_BASE + "context_frame.html",
targetElementId: EXPECT_TARGET_ELEMENT,
},
async doOpenMenu() {
frameId = await ContentTask.spawn(gBrowser.selectedBrowser, {}, function() {
- ChromeUtils.import("resource://gre/modules/WebNavigationFrames.jsm");
+ const {WebNavigationFrames} = ChromeUtils.import("resource://gre/modules/WebNavigationFrames.jsm");
let {contentWindow} = content.document.getElementById("frame");
return WebNavigationFrames.getFrameId(contentWindow);
});
await openContextMenuInFrame("#frame");
},
async doCloseMenu() {
await closeExtensionContextMenu();
diff --git browser/components/extensions/test/browser/browser_ext_openPanel.js browser/components/extensions/test/browser/browser_ext_openPanel.js
--- browser/components/extensions/test/browser/browser_ext_openPanel.js
+++ browser/components/extensions/test/browser/browser_ext_openPanel.js
@@ -1,14 +1,14 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
add_task(async function test_openPopup_requires_user_interaction() {
- const {GlobalManager} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ const {GlobalManager} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
async function backgroundScript() {
browser.tabs.onUpdated.addListener(async (tabId, changeInfo, tabInfo) => {
if (changeInfo.status != "complete") {
return;
}
await browser.pageAction.show(tabId);
diff --git browser/components/extensions/test/browser/browser_ext_pageAction_context.js browser/components/extensions/test/browser/browser_ext_pageAction_context.js
--- browser/components/extensions/test/browser/browser_ext_pageAction_context.js
+++ browser/components/extensions/test/browser/browser_ext_pageAction_context.js
@@ -276,17 +276,17 @@ add_task(async function testMultipleWind
});
});
add_task(async function testNavigationClearsData() {
let url = "http://example.com/";
let default_title = "Default title";
let tab_title = "Tab title";
- let {Management: {global: {tabTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ let {Management: {global: {tabTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
let extension, tabs = [];
async function addTab(...args) {
let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, ...args);
tabs.push(tab);
return tab;
}
async function sendMessage(method, param, expect, msg) {
extension.sendMessage({method, param, expect, msg});
diff --git browser/components/extensions/test/browser/browser_ext_pageAction_show_matches.js browser/components/extensions/test/browser/browser_ext_pageAction_show_matches.js
--- browser/components/extensions/test/browser/browser_ext_pageAction_show_matches.js
+++ browser/components/extensions/test/browser/browser_ext_pageAction_show_matches.js
@@ -54,17 +54,17 @@ let tests = [
let urls = [
"http://example.com/",
"http://mochi.test:8888/",
"about:rights",
"about:about",
];
function getId(tab) {
- let {Management: {global: {tabTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ let {Management: {global: {tabTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
getId = tabTracker.getId.bind(tabTracker); // eslint-disable-line no-func-assign
return getId(tab);
}
async function check(extension, tab, expected, msg) {
await promiseAnimationFrame();
let widgetId = makeWidgetId(extension.id);
let pageActionId = BrowserPageActions.urlbarButtonNodeIDForActionID(widgetId);
diff --git browser/components/extensions/test/browser/browser_ext_pageAction_simple.js browser/components/extensions/test/browser/browser_ext_pageAction_simple.js
--- browser/components/extensions/test/browser/browser_ext_pageAction_simple.js
+++ browser/components/extensions/test/browser/browser_ext_pageAction_simple.js
@@ -1,13 +1,13 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-ChromeUtils.import("resource:///modules/PageActions.jsm");
+const {PageActions} = ChromeUtils.import("resource:///modules/PageActions.jsm");
const BASE = "http://example.com/browser/browser/components/extensions/test/browser/";
add_task(async function test_pageAction_basic() {
let extension = ExtensionTestUtils.loadExtension({
manifest: {
"page_action": {
"default_popup": "popup.html",
diff --git browser/components/extensions/test/browser/browser_ext_runtime_setUninstallURL.js browser/components/extensions/test/browser/browser_ext_runtime_setUninstallURL.js
--- browser/components/extensions/test/browser/browser_ext_runtime_setUninstallURL.js
+++ browser/components/extensions/test/browser/browser_ext_runtime_setUninstallURL.js
@@ -1,12 +1,12 @@
"use strict";
-let {AddonManager} = ChromeUtils.import("resource://gre/modules/AddonManager.jsm", {});
-let {ExtensionTestCommon} = ChromeUtils.import("resource://testing-common/ExtensionTestCommon.jsm", {});
+let {AddonManager} = ChromeUtils.import("resource://gre/modules/AddonManager.jsm");
+let {ExtensionTestCommon} = ChromeUtils.import("resource://testing-common/ExtensionTestCommon.jsm");
async function makeAndInstallXPI(id, backgroundScript, loadedURL) {
let xpi = ExtensionTestCommon.generateXPI({
manifest: {applications: {gecko: {id}}},
background: backgroundScript,
});
SimpleTest.registerCleanupFunction(function cleanupXPI() {
Services.obs.notifyObservers(xpi, "flush-cache-entry");
diff --git browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_private.js browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_private.js
--- browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_private.js
+++ browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_private.js
@@ -25,17 +25,17 @@ add_task(async function test_sessions_ge
background,
});
// Open a private browsing window.
let privateWin = await BrowserTestUtils.openNewBrowserWindow({private: true});
await extension.startup();
- let {Management: {global: {windowTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ let {Management: {global: {windowTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
let privateWinId = windowTracker.getId(privateWin);
extension.sendMessage("check-sessions");
let recentlyClosed = await extension.awaitMessage("recentlyClosed");
recordInitialTimestamps(recentlyClosed.map(item => item.lastModified));
// Open and close two tabs in the private window
let tab = await BrowserTestUtils.openNewForegroundTab(privateWin.gBrowser, "http://example.com");
diff --git browser/components/extensions/test/browser/browser_ext_sessions_restore.js browser/components/extensions/test/browser/browser_ext_sessions_restore.js
--- browser/components/extensions/test/browser/browser_ext_sessions_restore.js
+++ browser/components/extensions/test/browser/browser_ext_sessions_restore.js
@@ -50,17 +50,17 @@ add_task(async function test_sessions_re
async function assertNotificationCount(expected) {
let notificationCount = await extension.awaitMessage("notificationCount");
is(notificationCount, expected, "the expected number of notifications was fired");
}
await extension.startup();
- let {Management: {global: {windowTracker, tabTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ let {Management: {global: {windowTracker, tabTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
function checkLocalTab(tab, expectedUrl) {
let realTab = tabTracker.getTab(tab.id);
let tabState = JSON.parse(SessionStore.getTabState(realTab));
is(tabState.entries[0].url, expectedUrl, "restored tab has the expected url");
}
await extension.awaitMessage("ready");
diff --git browser/components/extensions/test/browser/browser_ext_sidebarAction_context.js browser/components/extensions/test/browser/browser_ext_sidebarAction_context.js
--- browser/components/extensions/test/browser/browser_ext_sidebarAction_context.js
+++ browser/components/extensions/test/browser/browser_ext_sidebarAction_context.js
@@ -1,13 +1,13 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
async function runTests(options) {
async function background(getTests) {
async function checkDetails(expecting, details) {
let title = await browser.sidebarAction.getTitle(details);
browser.test.assertEq(expecting.title, title,
"expected value from getTitle in " + JSON.stringify(details));
diff --git browser/components/extensions/test/browser/browser_ext_tabs_audio.js browser/components/extensions/test/browser/browser_ext_tabs_audio.js
--- browser/components/extensions/test/browser/browser_ext_tabs_audio.js
+++ browser/components/extensions/test/browser/browser_ext_tabs_audio.js
@@ -154,17 +154,17 @@ add_task(async function() {
manifest: {
"permissions": ["tabs"],
},
background,
});
extension.onMessage("change-tab", (tabId, attr, on) => {
- let {Management: {global: {tabTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ let {Management: {global: {tabTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
let tab = tabTracker.getTab(tabId);
if (attr == "muted") {
// Ideally we'd simulate a click on the tab audio icon for this, but the
// handler relies on CSS :hover states, which are complicated and fragile
// to simulate.
if (tab.muted != on) {
diff --git browser/components/extensions/test/browser/browser_ext_tabs_create_url.js browser/components/extensions/test/browser/browser_ext_tabs_create_url.js
--- browser/components/extensions/test/browser/browser_ext_tabs_create_url.js
+++ browser/components/extensions/test/browser/browser_ext_tabs_create_url.js
@@ -1,17 +1,17 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
async function runWithDisabledPrivateBrowsing(callback) {
const {
EnterprisePolicyTesting,
PoliciesPrefTracker,
- } = ChromeUtils.import("resource://testing-common/EnterprisePolicyTesting.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/EnterprisePolicyTesting.jsm", null);
PoliciesPrefTracker.start();
await EnterprisePolicyTesting.setupPolicyEngineWithJson({
policies: {DisablePrivateBrowsing: true},
});
try {
await callback();
diff --git browser/components/extensions/test/browser/browser_ext_tabs_discarded.js browser/components/extensions/test/browser/browser_ext_tabs_discarded.js
--- browser/components/extensions/test/browser/browser_ext_tabs_discarded.js
+++ browser/components/extensions/test/browser/browser_ext_tabs_discarded.js
@@ -1,14 +1,14 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
/* global gBrowser SessionStore */
"use strict";
-const {Utils} = ChromeUtils.import("resource://gre/modules/sessionstore/Utils.jsm", {});
+const {Utils} = ChromeUtils.import("resource://gre/modules/sessionstore/Utils.jsm");
const triggeringPrincipal_base64 = Utils.SERIALIZED_SYSTEMPRINCIPAL;
let lazyTabState = {entries: [{url: "http://example.com/", triggeringPrincipal_base64, title: "Example Domain"}]};
add_task(async function test_discarded() {
let extension = ExtensionTestUtils.loadExtension({
manifest: {
"permissions": ["tabs", "webNavigation"],
diff --git browser/components/extensions/test/browser/browser_ext_tabs_duplicate.js browser/components/extensions/test/browser/browser_ext_tabs_duplicate.js
--- browser/components/extensions/test/browser/browser_ext_tabs_duplicate.js
+++ browser/components/extensions/test/browser/browser_ext_tabs_duplicate.js
@@ -89,17 +89,17 @@ add_task(async function testDuplicateTab
manifest: {
"permissions": ["tabs"],
},
background,
});
extension.onMessage("duplicate-tab", tabId => {
- let {Management: {global: {tabTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ let {Management: {global: {tabTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
let tab = tabTracker.getTab(tabId);
// This is a bit of a hack to load a tab in the background.
let newTab = gBrowser.duplicateTab(tab, true);
BrowserTestUtils.waitForEvent(newTab, "SSTabRestored", () => true).then(() => {
extension.sendMessage("duplicate-tab-done", tabTracker.getId(newTab));
});
diff --git browser/components/extensions/test/browser/browser_ext_tabs_executeScript.js browser/components/extensions/test/browser/browser_ext_tabs_executeScript.js
--- browser/components/extensions/test/browser/browser_ext_tabs_executeScript.js
+++ browser/components/extensions/test/browser/browser_ext_tabs_executeScript.js
@@ -1,17 +1,17 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
XPCOMUtils.defineLazyPreferenceGetter(this, "useRemoteWebExtensions",
"extensions.webextensions.remote", false);
add_task(async function testExecuteScript() {
- let {MessageChannel} = ChromeUtils.import("resource://gre/modules/MessageChannel.jsm", {});
+ let {MessageChannel} = ChromeUtils.import("resource://gre/modules/MessageChannel.jsm");
function countMM(messageManagerMap) {
let count = 0;
// List of permanent message managers in the main process. We should not
// count them in the test because MessageChannel unsubscribes when the
// message manager closes, which never happens to these, of course.
let globalMMs = [
Services.mm,
diff --git browser/components/extensions/test/browser/browser_ext_tabs_hide.js browser/components/extensions/test/browser/browser_ext_tabs_hide.js
--- browser/components/extensions/test/browser/browser_ext_tabs_hide.js
+++ browser/components/extensions/test/browser/browser_ext_tabs_hide.js
@@ -1,15 +1,15 @@
"use strict";
ChromeUtils.defineModuleGetter(this, "SessionStore",
"resource:///modules/sessionstore/SessionStore.jsm");
ChromeUtils.defineModuleGetter(this, "TabStateFlusher",
"resource:///modules/sessionstore/TabStateFlusher.jsm");
-const {Utils} = ChromeUtils.import("resource://gre/modules/sessionstore/Utils.jsm", {});
+const {Utils} = ChromeUtils.import("resource://gre/modules/sessionstore/Utils.jsm");
const triggeringPrincipal_base64 = Utils.SERIALIZED_SYSTEMPRINCIPAL;
async function doorhangerTest(testFn) {
await SpecialPowers.pushPrefEnv({
set: [["extensions.webextensions.tabhide.enabled", true]],
});
let extension = ExtensionTestUtils.loadExtension({
diff --git browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js
--- browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js
+++ browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js
@@ -1,14 +1,14 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
add_task(async function testExecuteScript() {
- let {MessageChannel} = ChromeUtils.import("resource://gre/modules/MessageChannel.jsm", {});
+ let {MessageChannel} = ChromeUtils.import("resource://gre/modules/MessageChannel.jsm");
// When the first extension is started, ProxyMessenger.init adds MessageChannel
// listeners for Services.mm and Services.ppmm, and they are never unsubscribed.
// We have to exclude them after the extension has been unloaded to get an accurate
// test.
function getMessageManagersSize(messageManagers) {
return Array.from(messageManagers).filter(([mm]) => {
return !([Services.mm, Services.ppmm].includes(mm));
diff --git browser/components/extensions/test/browser/browser_ext_tabs_lazy.js browser/components/extensions/test/browser/browser_ext_tabs_lazy.js
--- browser/components/extensions/test/browser/browser_ext_tabs_lazy.js
+++ browser/components/extensions/test/browser/browser_ext_tabs_lazy.js
@@ -1,11 +1,11 @@
"use strict";
-const {Utils} = ChromeUtils.import("resource://gre/modules/sessionstore/Utils.jsm", {});
+const {Utils} = ChromeUtils.import("resource://gre/modules/sessionstore/Utils.jsm");
const triggeringPrincipal_base64 = Utils.SERIALIZED_SYSTEMPRINCIPAL;
const SESSION = {
windows: [{
tabs: [
{entries: [{url: "about:blank", triggeringPrincipal_base64}]},
{entries: [{url: "https://example.com/", triggeringPrincipal_base64}]},
],
diff --git browser/components/extensions/test/browser/browser_ext_tabs_zoom.js browser/components/extensions/test/browser/browser_ext_tabs_zoom.js
--- browser/components/extensions/test/browser/browser_ext_tabs_zoom.js
+++ browser/components/extensions/test/browser/browser_ext_tabs_zoom.js
@@ -194,17 +194,17 @@ add_task(async function test_zoom_api()
manifest: {
"permissions": ["tabs"],
},
background,
});
extension.onMessage("msg", (id, msg, ...args) => {
- let {Management: {global: {tabTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ let {Management: {global: {tabTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
let resp;
if (msg == "get-zoom") {
let tab = tabTracker.getTab(args[0]);
resp = ZoomManager.getZoomForBrowser(tab.linkedBrowser);
} else if (msg == "set-zoom") {
let tab = tabTracker.getTab(args[0]);
ZoomManager.setZoomForBrowser(tab.linkedBrowser);
diff --git browser/components/extensions/test/browser/browser_ext_windows.js browser/components/extensions/test/browser/browser_ext_windows.js
--- browser/components/extensions/test/browser/browser_ext_windows.js
+++ browser/components/extensions/test/browser/browser_ext_windows.js
@@ -86,17 +86,17 @@ add_task(async function testWindowTitle(
let extension = ExtensionTestUtils.loadExtension({
background,
manifest: {
permissions: ["tabs"],
},
});
await extension.startup();
- let {Management: {global: {windowTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ let {Management: {global: {windowTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
async function createApiWin(options) {
let promiseLoaded = BrowserTestUtils.waitForNewWindow({url: START_URL});
extension.sendMessage("create", options);
let apiWin = await extension.awaitMessage("created");
let realWin = windowTracker.getWindow(apiWin.id);
await promiseLoaded;
let expectedPreface = options.titlePreface ? options.titlePreface : "";
diff --git browser/components/extensions/test/browser/browser_ext_windows_allowScriptsToClose.js browser/components/extensions/test/browser/browser_ext_windows_allowScriptsToClose.js
--- browser/components/extensions/test/browser/browser_ext_windows_allowScriptsToClose.js
+++ browser/components/extensions/test/browser/browser_ext_windows_allowScriptsToClose.js
@@ -1,14 +1,14 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
if (!gMultiProcessBrowser) {
- const {PromiseTestUtils} = ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", {});
+ const {PromiseTestUtils} = ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm");
PromiseTestUtils.whitelistRejectionsGlobally(/Message manager disconnected/);
}
// Tests allowScriptsToClose option
add_task(async function test_allowScriptsToClose() {
const files = {
"dummy.html": "<meta charset=utf-8><script src=close.js></script>",
"close.js": function() {
diff --git browser/components/extensions/test/browser/browser_ext_windows_create_tabId.js browser/components/extensions/test/browser/browser_ext_windows_create_tabId.js
--- browser/components/extensions/test/browser/browser_ext_windows_create_tabId.js
+++ browser/components/extensions/test/browser/browser_ext_windows_create_tabId.js
@@ -1,15 +1,15 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
function assertNoLeaksInTabTracker() {
// Check that no tabs have been leaked by the internal tabTracker helper class.
- const {ExtensionParent} = ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm", {});
+ const {ExtensionParent} = ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
const {tabTracker} = ExtensionParent.apiManager.global;
for (const [tabId, nativeTab] of tabTracker._tabIds) {
if (!nativeTab.ownerGlobal) {
ok(false, `A tab with tabId ${tabId} has been leaked in the tabTracker ("${nativeTab.title}")`);
}
}
}
diff --git browser/components/extensions/test/browser/browser_ext_windows_events.js browser/components/extensions/test/browser/browser_ext_windows_events.js
--- browser/components/extensions/test/browser/browser_ext_windows_events.js
+++ browser/components/extensions/test/browser/browser_ext_windows_events.js
@@ -58,17 +58,17 @@ add_task(async function test_windows_eve
info("Ignoring a superfluous WINDOW_ID_NONE (blur) event.");
windowInfo = await extension.awaitMessage("window-focus-changed");
}
is(windowInfo.winId, windowInfo.lastFocusedWindowId,
"Last focused window has the correct id");
return windowInfo.winId;
}
- let {Management: {global: {windowTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ let {Management: {global: {windowTracker}}} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
let currentWindow = window;
let currentWindowId = windowTracker.getId(currentWindow);
info(`Current window ID: ${currentWindowId}`);
info("Create browser window 1");
let win1 = await BrowserTestUtils.openNewBrowserWindow();
let win1Id = await extension.awaitMessage("window-created");
diff --git browser/components/extensions/test/browser/head.js browser/components/extensions/test/browser/head.js
--- browser/components/extensions/test/browser/head.js
+++ browser/components/extensions/test/browser/head.js
@@ -25,27 +25,27 @@
* getIncognitoWindow startIncognitoMonitorExtension
*/
// There are shutdown issues for which multiple rejections are left uncaught.
// This bug should be fixed, but for the moment this directory is whitelisted.
//
// NOTE: Entire directory whitelisting should be kept to a minimum. Normally you
// should use "expectUncaughtRejection" to flag individual failures.
-const {PromiseTestUtils} = ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", {});
+const {PromiseTestUtils} = ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm");
PromiseTestUtils.whitelistRejectionsGlobally(/Message manager disconnected/);
PromiseTestUtils.whitelistRejectionsGlobally(/No matching message handler/);
PromiseTestUtils.whitelistRejectionsGlobally(/Receiving end does not exist/);
-const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm", {});
-const {CustomizableUI} = ChromeUtils.import("resource:///modules/CustomizableUI.jsm", {});
-const {Preferences} = ChromeUtils.import("resource://gre/modules/Preferences.jsm", {});
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {CustomizableUI} = ChromeUtils.import("resource:///modules/CustomizableUI.jsm");
+const {Preferences} = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
XPCOMUtils.defineLazyGetter(this, "Management", () => {
- const {Management} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ const {Management} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
return Management;
});
// The extension tests can run a lot slower under ASAN.
if (AppConstants.ASAN) {
SimpleTest.requestLongerTimeout(10);
}
@@ -65,17 +65,17 @@ if (remote) {
// Don't try to create screenshots of sites we load during tests.
Services.prefs.getDefaultBranch("browser.newtabpage.activity-stream.")
.setBoolPref("feeds.topsites", false);
{
// Touch the recipeParentPromise lazy getter so we don't get
// `this._recipeManager is undefined` errors during tests.
- const {LoginManagerParent} = ChromeUtils.import("resource://gre/modules/LoginManagerParent.jsm", null);
+ const {LoginManagerParent} = ChromeUtils.import("resource://gre/modules/LoginManagerParent.jsm");
void LoginManagerParent.recipeParentPromise;
}
// Bug 1239884: Our tests occasionally hit a long GC pause at unpredictable
// times in debug builds, which results in intermittent timeouts. Until we have
// a better solution, we force a GC after certain strategic tests, which tend to
// accumulate a high number of unreaped windows.
function forceGC() {
diff --git browser/components/extensions/test/browser/head_webNavigation.js browser/components/extensions/test/browser/head_webNavigation.js
--- browser/components/extensions/test/browser/head_webNavigation.js
+++ browser/components/extensions/test/browser/head_webNavigation.js
@@ -28,12 +28,12 @@ async function runCreatedNavigationTarge
}
// Test that there are no pending createdNavigationTarget messages still tracked
// in WebNavigation.jsm (to be called before the extension is unloaded, because
// once the last extension which have subscribed a webNavigation event is unloaded
// all the pending created navigation target data is completely cleared).
function assertNoPendingCreatedNavigationTargetData() {
- const {Manager} = ChromeUtils.import("resource://gre/modules/WebNavigation.jsm", {});
+ const {Manager} = ChromeUtils.import("resource://gre/modules/WebNavigation.jsm", null);
Assert.equal(Manager.createdNavigationTargetByOuterWindowId.size, 0,
"There should be no pending createdNavigationTarget messages in WebNavigation");
}
diff --git browser/components/extensions/test/xpcshell/head.js browser/components/extensions/test/xpcshell/head.js
--- browser/components/extensions/test/xpcshell/head.js
+++ browser/components/extensions/test/xpcshell/head.js
@@ -1,14 +1,14 @@
"use strict";
/* exported createHttpServer, promiseConsoleOutput */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
// eslint-disable-next-line no-unused-vars
XPCOMUtils.defineLazyModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.jsm",
Extension: "resource://gre/modules/Extension.jsm",
ExtensionData: "resource://gre/modules/Extension.jsm",
ExtensionTestUtils: "resource://testing-common/ExtensionXPCShellUtils.jsm",
FileUtils: "resource://gre/modules/FileUtils.jsm",
diff --git browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js
--- browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js
+++ browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js
@@ -1,14 +1,14 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
-ChromeUtils.import("resource:///modules/HomePage.jsm");
+const {AddonTestUtils} = ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
+const {HomePage} = ChromeUtils.import("resource:///modules/HomePage.jsm");
const {
createAppInfo,
promiseShutdownManager,
promiseStartupManager,
} = AddonTestUtils;
AddonTestUtils.init(this);
diff --git browser/components/extensions/test/xpcshell/test_ext_history.js browser/components/extensions/test/xpcshell/test_ext_history.js
--- browser/components/extensions/test/xpcshell/test_ext_history.js
+++ browser/components/extensions/test/xpcshell/test_ext_history.js
@@ -4,17 +4,17 @@
ChromeUtils.defineModuleGetter(this, "PlacesTestUtils",
"resource://testing-common/PlacesTestUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(this, "ExtensionCommon",
"resource://gre/modules/ExtensionCommon.jsm");
-ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm");
+const {PromiseTestUtils} = ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm");
PromiseTestUtils.whitelistRejectionsGlobally(/Message manager disconnected/);
add_task(async function test_delete() {
function background() {
let historyClearedCount = 0;
let removedUrls = [];
diff --git browser/components/extensions/test/xpcshell/test_ext_pageAction_shutdown.js browser/components/extensions/test/xpcshell/test_ext_pageAction_shutdown.js
--- browser/components/extensions/test/xpcshell/test_ext_pageAction_shutdown.js
+++ browser/components/extensions/test/xpcshell/test_ext_pageAction_shutdown.js
@@ -1,14 +1,14 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-ChromeUtils.import("resource:///modules/PageActions.jsm");
-ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
+const {PageActions} = ChromeUtils.import("resource:///modules/PageActions.jsm");
+const {AddonTestUtils} = ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
const {
createAppInfo,
promiseShutdownManager,
promiseStartupManager,
} = AddonTestUtils;
AddonTestUtils.init(this);
diff --git browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search.js browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search.js
--- browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search.js
+++ browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search.js
@@ -1,15 +1,15 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
+const {AddonTestUtils} = ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
+const {setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
let delay = () => new Promise(resolve => setTimeout(resolve, 0));
const kSearchEngineURL = "https://example.com/?search={searchTerms}";
const kSearchSuggestURL = "http://example.com/?suggest={searchTerms}";
const kSearchTerm = "foo";
const kSearchTermIntl = "日";
const URLTYPE_SUGGEST_JSON = "application/x-suggestions+json";
diff --git browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search_mozParam.js browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search_mozParam.js
--- browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search_mozParam.js
+++ browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search_mozParam.js
@@ -1,14 +1,14 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
+const {AddonTestUtils} = ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
AddonTestUtils.init(this);
AddonTestUtils.overrideCertDB();
AddonTestUtils.createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "42", "42");
let {
promiseShutdownManager,
promiseStartupManager,
diff --git browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab.js browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab.js
--- browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab.js
+++ browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab.js
@@ -1,26 +1,26 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
XPCOMUtils.defineLazyGetter(this, "Management", () => {
// eslint-disable-next-line no-shadow
- const {Management} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ const {Management} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
return Management;
});
ChromeUtils.defineModuleGetter(this, "AddonManager",
"resource://gre/modules/AddonManager.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "aboutNewTabService",
"@mozilla.org/browser/aboutnewtab-service;1",
"nsIAboutNewTabService");
-ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
+const {AddonTestUtils} = ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
const {
createAppInfo,
promiseRestartManager,
promiseShutdownManager,
promiseStartupManager,
} = AddonTestUtils;
diff --git browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab_update.js browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab_update.js
--- browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab_update.js
+++ browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab_update.js
@@ -1,17 +1,17 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
XPCOMUtils.defineLazyServiceGetter(this, "aboutNewTabService",
"@mozilla.org/browser/aboutnewtab-service;1",
"nsIAboutNewTabService");
-ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
+const {AddonTestUtils} = ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
const {
createAppInfo,
createTempWebExtensionFile,
promiseCompleteAllInstalls,
promiseFindAddonUpdates,
promiseShutdownManager,
promiseStartupManager,
diff --git browser/components/migration/360seProfileMigrator.js browser/components/migration/360seProfileMigrator.js
--- browser/components/migration/360seProfileMigrator.js
+++ browser/components/migration/360seProfileMigrator.js
@@ -1,19 +1,19 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
-ChromeUtils.import("resource://gre/modules/osfile.jsm");
-ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
+const {MigrationUtils, MigratorPrototype} = ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Sqlite",
"resource://gre/modules/Sqlite.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
diff --git browser/components/migration/ChromeMigrationUtils.jsm browser/components/migration/ChromeMigrationUtils.jsm
--- browser/components/migration/ChromeMigrationUtils.jsm
+++ browser/components/migration/ChromeMigrationUtils.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["ChromeMigrationUtils"];
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/osfile.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var ChromeMigrationUtils = {
_extensionVersionDirectoryNames: {},
// The cache for the locale strings.
// For example, the data could be:
// {
// "profile-id-1": {
diff --git browser/components/migration/ChromeProfileMigrator.js browser/components/migration/ChromeProfileMigrator.js
--- browser/components/migration/ChromeProfileMigrator.js
+++ browser/components/migration/ChromeProfileMigrator.js
@@ -10,23 +10,23 @@ const S100NS_FROM1601TO1970 = 0x19DB1DED
const S100NS_PER_MS = 10;
const AUTH_TYPE = {
SCHEME_HTML: 0,
SCHEME_BASIC: 1,
SCHEME_DIGEST: 2,
};
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-ChromeUtils.import("resource://gre/modules/osfile.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource:///modules/ChromeMigrationUtils.jsm");
-ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {ChromeMigrationUtils} = ChromeUtils.import("resource:///modules/ChromeMigrationUtils.jsm");
+const {MigrationUtils, MigratorPrototype} = ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(this, "OSCrypto",
"resource://gre/modules/OSCrypto.jsm");
/**
* Convert Chrome time format to Date object
diff --git browser/components/migration/ESEDBReader.jsm browser/components/migration/ESEDBReader.jsm
--- browser/components/migration/ESEDBReader.jsm
+++ browser/components/migration/ESEDBReader.jsm
@@ -1,19 +1,19 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["ESEDBReader"]; /* exported ESEDBReader */
-ChromeUtils.import("resource://gre/modules/ctypes.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {ctypes} = ChromeUtils.import("resource://gre/modules/ctypes.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyGetter(this, "log", () => {
let ConsoleAPI = ChromeUtils.import("resource://gre/modules/Console.jsm", {}).ConsoleAPI;
let consoleOptions = {
maxLogLevelPref: "browser.esedbreader.loglevel",
prefix: "ESEDBReader",
};
return new ConsoleAPI(consoleOptions);
});
diff --git browser/components/migration/EdgeProfileMigrator.js browser/components/migration/EdgeProfileMigrator.js
--- browser/components/migration/EdgeProfileMigrator.js
+++ browser/components/migration/EdgeProfileMigrator.js
@@ -1,19 +1,19 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/osfile.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
-ChromeUtils.import("resource:///modules/MSMigrationUtils.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {MigrationUtils, MigratorPrototype} = ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
+const {MSMigrationUtils} = ChromeUtils.import("resource:///modules/MSMigrationUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(this, "ESEDBReader",
"resource:///modules/ESEDBReader.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
const kEdgeRegistryRoot = "SOFTWARE\\Classes\\Local Settings\\Software\\" +
diff --git browser/components/migration/FirefoxProfileMigrator.js browser/components/migration/FirefoxProfileMigrator.js
--- browser/components/migration/FirefoxProfileMigrator.js
+++ browser/components/migration/FirefoxProfileMigrator.js
@@ -8,19 +8,19 @@
/*
* Migrates from a Firefox profile in a lossy manner in order to clean up a
* user's profile. Data is only migrated where the benefits outweigh the
* potential problems caused by importing undesired/invalid configurations
* from the source profile.
*/
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {MigrationUtils, MigratorPrototype} = ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesBackups",
"resource://gre/modules/PlacesBackups.jsm");
ChromeUtils.defineModuleGetter(this, "SessionMigration",
"resource:///modules/sessionstore/SessionMigration.jsm");
ChromeUtils.defineModuleGetter(this, "OS",
"resource://gre/modules/osfile.jsm");
ChromeUtils.defineModuleGetter(this, "FileUtils",
diff --git browser/components/migration/IEProfileMigrator.js browser/components/migration/IEProfileMigrator.js
--- browser/components/migration/IEProfileMigrator.js
+++ browser/components/migration/IEProfileMigrator.js
@@ -1,22 +1,22 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const kLoginsKey = "Software\\Microsoft\\Internet Explorer\\IntelliForms\\Storage2";
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/osfile.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
-ChromeUtils.import("resource:///modules/MSMigrationUtils.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {MigrationUtils, MigratorPrototype} = ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
+const {MSMigrationUtils} = ChromeUtils.import("resource:///modules/MSMigrationUtils.jsm");
ChromeUtils.defineModuleGetter(this, "ctypes",
"resource://gre/modules/ctypes.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(this, "OSCrypto",
"resource://gre/modules/OSCrypto.jsm");
diff --git browser/components/migration/MSMigrationUtils.jsm browser/components/migration/MSMigrationUtils.jsm
--- browser/components/migration/MSMigrationUtils.jsm
+++ browser/components/migration/MSMigrationUtils.jsm
@@ -1,20 +1,20 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["MSMigrationUtils"];
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {MigrationUtils} = ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["FileReader"]);
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(this, "WindowsRegistry",
"resource://gre/modules/WindowsRegistry.jsm");
ChromeUtils.defineModuleGetter(this, "ctypes",
diff --git browser/components/migration/MigrationUtils.jsm browser/components/migration/MigrationUtils.jsm
--- browser/components/migration/MigrationUtils.jsm
+++ browser/components/migration/MigrationUtils.jsm
@@ -5,19 +5,19 @@
"use strict";
var EXPORTED_SYMBOLS = ["MigrationUtils", "MigratorPrototype"];
const TOPIC_WILL_IMPORT_BOOKMARKS = "initial-migration-will-import-default-bookmarks";
const TOPIC_DID_IMPORT_BOOKMARKS = "initial-migration-did-import-default-bookmarks";
const TOPIC_PLACES_DEFAULTS_FINISHED = "places-browser-init-complete";
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
ChromeUtils.defineModuleGetter(this, "BookmarkHTMLUtils",
"resource://gre/modules/BookmarkHTMLUtils.jsm");
ChromeUtils.defineModuleGetter(this, "LoginHelper",
"resource://gre/modules/LoginHelper.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
diff --git browser/components/migration/ProfileMigrator.js browser/components/migration/ProfileMigrator.js
--- browser/components/migration/ProfileMigrator.js
+++ browser/components/migration/ProfileMigrator.js
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {MigrationUtils} = ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
function ProfileMigrator() {
}
ProfileMigrator.prototype = {
migrate: MigrationUtils.startupMigration.bind(MigrationUtils),
QueryInterface: ChromeUtils.generateQI([Ci.nsIProfileMigrator]),
classDescription: "Profile Migrator",
diff --git browser/components/migration/SafariProfileMigrator.js browser/components/migration/SafariProfileMigrator.js
--- browser/components/migration/SafariProfileMigrator.js
+++ browser/components/migration/SafariProfileMigrator.js
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
-ChromeUtils.import("resource://gre/modules/osfile.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
+const {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {MigrationUtils, MigratorPrototype} = ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PropertyListUtils",
"resource://gre/modules/PropertyListUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(this, "FormHistory",
"resource://gre/modules/FormHistory.jsm");
diff --git browser/components/migration/content/migration.js browser/components/migration/content/migration.js
--- browser/components/migration/content/migration.js
+++ browser/components/migration/content/migration.js
@@ -2,18 +2,18 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const kIMig = Ci.nsIBrowserProfileMigrator;
const kIPStartup = Ci.nsIProfileStartup;
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {MigrationUtils} = ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
var MigrationWizard = { /* exported MigrationWizard */
_source: "", // Source Profile Migrator ContractID suffix
_itemsFlags: kIMig.ALL, // Selected Import Data Sources (16-bit bitfield)
_selectedProfile: null, // Selected Profile name to import from
_wiz: null,
_migrator: null,
_autoMigrate: null,
diff --git browser/components/migration/tests/unit/head_migration.js browser/components/migration/tests/unit/head_migration.js
--- browser/components/migration/tests/unit/head_migration.js
+++ browser/components/migration/tests/unit/head_migration.js
@@ -1,32 +1,32 @@
"use strict";
-ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
-ChromeUtils.import("resource://gre/modules/LoginHelper.jsm");
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Preferences.jsm");
-ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://testing-common/TestUtils.jsm");
-ChromeUtils.import("resource://testing-common/PlacesTestUtils.jsm");
+var {MigrationUtils, MigratorPrototype} = ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
+var {LoginHelper} = ChromeUtils.import("resource://gre/modules/LoginHelper.jsm");
+var {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+var {PlacesUtils} = ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
+var {Preferences} = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
+var {PromiseUtils} = ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {TestUtils} = ChromeUtils.import("resource://testing-common/TestUtils.jsm");
+var {PlacesTestUtils} = ChromeUtils.import("resource://testing-common/PlacesTestUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, [ "URL" ]);
ChromeUtils.defineModuleGetter(this, "FileUtils",
"resource://gre/modules/FileUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Sqlite",
"resource://gre/modules/Sqlite.jsm");
// Initialize profile.
var gProfD = do_get_profile();
-ChromeUtils.import("resource://testing-common/AppInfo.jsm");
+var {getAppInfo, newAppInfo, updateAppInfo} = ChromeUtils.import("resource://testing-common/AppInfo.jsm");
updateAppInfo();
/**
* Migrates the requested resource and waits for the migration to be complete.
*/
async function promiseMigration(migrator, resourceType, aProfile = null) {
// Ensure resource migration is available.
let availableSources = await migrator.getMigrateData(aProfile, false);
diff --git browser/components/migration/tests/unit/test_ChromeMigrationUtils.js browser/components/migration/tests/unit/test_ChromeMigrationUtils.js
--- browser/components/migration/tests/unit/test_ChromeMigrationUtils.js
+++ browser/components/migration/tests/unit/test_ChromeMigrationUtils.js
@@ -1,11 +1,11 @@
"use strict";
-ChromeUtils.import("resource:///modules/ChromeMigrationUtils.jsm");
+const {ChromeMigrationUtils} = ChromeUtils.import("resource:///modules/ChromeMigrationUtils.jsm");
// Setup chrome user data path for all platforms.
ChromeMigrationUtils.getDataPath = () => {
return do_get_file("Library/Application Support/Google/Chrome/").path;
};
add_task(async function test_getExtensionList_function() {
let extensionList = await ChromeMigrationUtils.getExtensionList("Default");
diff --git browser/components/migration/tests/unit/test_ChromeMigrationUtils_path.js browser/components/migration/tests/unit/test_ChromeMigrationUtils_path.js
--- browser/components/migration/tests/unit/test_ChromeMigrationUtils_path.js
+++ browser/components/migration/tests/unit/test_ChromeMigrationUtils_path.js
@@ -1,13 +1,13 @@
"use strict";
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource:///modules/ChromeMigrationUtils.jsm");
-ChromeUtils.import("resource://gre/modules/osfile.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {ChromeMigrationUtils} = ChromeUtils.import("resource:///modules/ChromeMigrationUtils.jsm");
+const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
function getRootPath() {
let dirKey;
if (AppConstants.platform == "win") {
dirKey = "winLocalAppDataDir";
} else if (AppConstants.platform == "macosx") {
dirKey = "macUserLibDir";
} else {
diff --git browser/components/migration/tests/unit/test_Chrome_bookmarks.js browser/components/migration/tests/unit/test_Chrome_bookmarks.js
--- browser/components/migration/tests/unit/test_Chrome_bookmarks.js
+++ browser/components/migration/tests/unit/test_Chrome_bookmarks.js
@@ -1,11 +1,11 @@
"use strict";
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
add_task(async function() {
let rootDir = do_get_file("chromefiles/", true);
let pathId;
let subDirs = ["Google", "Chrome"];
if (AppConstants.platform == "macosx") {
subDirs.unshift("Application Support");
pathId = "ULibDir";
@@ -23,17 +23,17 @@ add_task(async function() {
subDirs.push("Default");
while (subDirs.length) {
target.append(subDirs.shift());
}
// We don't import osfile.jsm until after registering the fake path, because
// importing osfile will sometimes greedily fetch certain path identifiers
// from the dir service, which means they get cached, which means we can't
// register a fake path for them anymore.
- ChromeUtils.import("resource://gre/modules/osfile.jsm");
+ const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
await OS.File.makeDir(target.path, {from: rootDir.parent.path, ignoreExisting: true});
target.append("Bookmarks");
await OS.File.remove(target.path, {ignoreAbsent: true});
let bookmarksData = {roots: {bookmark_bar: {children: []}, other: {children: []}}};
const MAX_BMS = 100;
let barKids = bookmarksData.roots.bookmark_bar.children;
diff --git browser/components/migration/tests/unit/test_Chrome_cookies.js browser/components/migration/tests/unit/test_Chrome_cookies.js
--- browser/components/migration/tests/unit/test_Chrome_cookies.js
+++ browser/components/migration/tests/unit/test_Chrome_cookies.js
@@ -1,11 +1,11 @@
"use strict";
-ChromeUtils.import("resource://gre/modules/ForgetAboutSite.jsm");
+const {ForgetAboutSite} = ChromeUtils.import("resource://gre/modules/ForgetAboutSite.jsm");
add_task(async function() {
registerFakePath("ULibDir", do_get_file("Library/"));
let migrator = await MigrationUtils.getMigrator("chrome");
Assert.ok(await migrator.isSourceAvailable(), "Sanity check the source exists");
const COOKIE = {
diff --git browser/components/migration/tests/unit/test_Chrome_passwords.js browser/components/migration/tests/unit/test_Chrome_passwords.js
--- browser/components/migration/tests/unit/test_Chrome_passwords.js
+++ browser/components/migration/tests/unit/test_Chrome_passwords.js
@@ -1,12 +1,12 @@
"use strict";
-ChromeUtils.import("resource://gre/modules/OSCrypto.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {OSCrypto} = ChromeUtils.import("resource://gre/modules/OSCrypto.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const PROFILE = {
id: "Default",
name: "Person 1",
};
const TEST_LOGINS = [
{
diff --git browser/components/migration/tests/unit/test_Edge_db_migration.js browser/components/migration/tests/unit/test_Edge_db_migration.js
--- browser/components/migration/tests/unit/test_Edge_db_migration.js
+++ browser/components/migration/tests/unit/test_Edge_db_migration.js
@@ -1,13 +1,13 @@
"use strict";
-ChromeUtils.import("resource://gre/modules/ctypes.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-let eseBackStage = ChromeUtils.import("resource:///modules/ESEDBReader.jsm", {});
+const {ctypes} = ChromeUtils.import("resource://gre/modules/ctypes.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+let eseBackStage = ChromeUtils.import("resource:///modules/ESEDBReader.jsm", null);
let ESE = eseBackStage.ESE;
let KERNEL = eseBackStage.KERNEL;
let gLibs = eseBackStage.gLibs;
let COLUMN_TYPES = eseBackStage.COLUMN_TYPES;
let declareESEFunction = eseBackStage.declareESEFunction;
let loadLibraries = eseBackStage.loadLibraries;
let gESEInstanceCounter = 1;
diff --git browser/components/migration/tests/unit/test_IE7_passwords.js browser/components/migration/tests/unit/test_IE7_passwords.js
--- browser/components/migration/tests/unit/test_IE7_passwords.js
+++ browser/components/migration/tests/unit/test_IE7_passwords.js
@@ -1,11 +1,11 @@
"use strict";
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
ChromeUtils.defineModuleGetter(this, "OSCrypto",
"resource://gre/modules/OSCrypto.jsm");
const IE7_FORM_PASSWORDS_MIGRATOR_NAME = "IE7FormPasswords";
const LOGINS_KEY = "Software\\Microsoft\\Internet Explorer\\IntelliForms\\Storage2";
const EXTENSION = "-backup";
const TESTED_WEBSITES = {
diff --git browser/components/newtab/aboutNewTabService.js browser/components/newtab/aboutNewTabService.js
--- browser/components/newtab/aboutNewTabService.js
+++ browser/components/newtab/aboutNewTabService.js
@@ -1,20 +1,20 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/E10SUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {E10SUtils} = ChromeUtils.import("resource://gre/modules/E10SUtils.jsm");
ChromeUtils.defineModuleGetter(this, "AboutNewTab",
"resource:///modules/AboutNewTab.jsm");
const TOPIC_APP_QUIT = "quit-application-granted";
const TOPIC_LOCALES_CHANGE = "intl:app-locales-changed";
const TOPIC_CONTENT_DOCUMENT_INTERACTIVE = "content-document-interactive";
diff --git browser/components/newtab/common/PerfService.jsm browser/components/newtab/common/PerfService.jsm
--- browser/components/newtab/common/PerfService.jsm
+++ browser/components/newtab/common/PerfService.jsm
@@ -1,14 +1,14 @@
/* globals Services */
"use strict";
/* istanbul ignore if */
if (typeof ChromeUtils !== "undefined") {
- ChromeUtils.import("resource://gre/modules/Services.jsm");
+ var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
}
let usablePerfObj;
/* istanbul ignore if */
/* istanbul ignore else */
if (typeof Services !== "undefined") {
// Borrow the high-resolution timer from the hidden window....
diff --git browser/components/newtab/common/Reducers.jsm browser/components/newtab/common/Reducers.jsm
--- browser/components/newtab/common/Reducers.jsm
+++ browser/components/newtab/common/Reducers.jsm
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
-const {Dedupe} = ChromeUtils.import("resource://activity-stream/common/Dedupe.jsm", {});
+const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
+const {Dedupe} = ChromeUtils.import("resource://activity-stream/common/Dedupe.jsm");
const TOP_SITES_DEFAULT_ROWS = 1;
const TOP_SITES_MAX_SITES_PER_ROW = 8;
const dedupe = new Dedupe(site => site && site.url);
const INITIAL_STATE = {
App: {
diff --git browser/components/newtab/data/content/activity-stream.bundle.js browser/components/newtab/data/content/activity-stream.bundle.js
--- browser/components/newtab/data/content/activity-stream.bundle.js
+++ browser/components/newtab/data/content/activity-stream.bundle.js
@@ -5457,17 +5457,17 @@ class ComponentPerfTimer extends react__
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "_PerfService", function() { return _PerfService; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "perfService", function() { return perfService; });
/* globals Services */
/* istanbul ignore if */
if (typeof ChromeUtils !== "undefined") {
- ChromeUtils.import("resource://gre/modules/Services.jsm");
+ var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
}
let usablePerfObj;
/* istanbul ignore if */
/* istanbul ignore else */
if (typeof Services !== "undefined") {
// Borrow the high-resolution timer from the hidden window....
diff --git browser/components/newtab/lib/ASRouter.jsm browser/components/newtab/lib/ASRouter.jsm
--- browser/components/newtab/lib/ASRouter.jsm
+++ browser/components/newtab/lib/ASRouter.jsm
@@ -1,37 +1,37 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]);
XPCOMUtils.defineLazyModuleGetters(this, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
UITour: "resource:///modules/UITour.jsm",
FxAccounts: "resource://gre/modules/FxAccounts.jsm",
});
-const {ASRouterActions: ra, actionTypes: at, actionCreators: ac} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
-const {CFRMessageProvider} = ChromeUtils.import("resource://activity-stream/lib/CFRMessageProvider.jsm", {});
-const {OnboardingMessageProvider} = ChromeUtils.import("resource://activity-stream/lib/OnboardingMessageProvider.jsm", {});
-const {SnippetsTestMessageProvider} = ChromeUtils.import("resource://activity-stream/lib/SnippetsTestMessageProvider.jsm", {});
-const {RemoteSettings} = ChromeUtils.import("resource://services-settings/remote-settings.js", {});
-const {CFRPageActions} = ChromeUtils.import("resource://activity-stream/lib/CFRPageActions.jsm", {});
+const {ASRouterActions: ra, actionTypes: at, actionCreators: ac} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
+const {CFRMessageProvider} = ChromeUtils.import("resource://activity-stream/lib/CFRMessageProvider.jsm");
+const {OnboardingMessageProvider} = ChromeUtils.import("resource://activity-stream/lib/OnboardingMessageProvider.jsm");
+const {SnippetsTestMessageProvider} = ChromeUtils.import("resource://activity-stream/lib/SnippetsTestMessageProvider.jsm");
+const {RemoteSettings} = ChromeUtils.import("resource://services-settings/remote-settings.js");
+const {CFRPageActions} = ChromeUtils.import("resource://activity-stream/lib/CFRPageActions.jsm");
ChromeUtils.defineModuleGetter(this, "ASRouterPreferences",
"resource://activity-stream/lib/ASRouterPreferences.jsm");
ChromeUtils.defineModuleGetter(this, "ASRouterTargeting",
"resource://activity-stream/lib/ASRouterTargeting.jsm");
ChromeUtils.defineModuleGetter(this, "QueryCache",
"resource://activity-stream/lib/ASRouterTargeting.jsm");
ChromeUtils.defineModuleGetter(this, "ASRouterTriggerListeners",
"resource://activity-stream/lib/ASRouterTriggerListeners.jsm");
-ChromeUtils.import("resource:///modules/AttributionCode.jsm");
+const {AttributionCode} = ChromeUtils.import("resource:///modules/AttributionCode.jsm");
const INCOMING_MESSAGE_NAME = "ASRouter:child-to-parent";
const OUTGOING_MESSAGE_NAME = "ASRouter:parent-to-child";
const ONE_DAY_IN_MS = 24 * 60 * 60 * 1000;
// List of hosts for endpoints that serve router messages.
// Key is allowed host, value is a name for the endpoint host.
const DEFAULT_WHITELIST_HOSTS = {
"activity-stream-icons.services.mozilla.com": "production",
diff --git browser/components/newtab/lib/ASRouterFeed.jsm browser/components/newtab/lib/ASRouterFeed.jsm
--- browser/components/newtab/lib/ASRouterFeed.jsm
+++ browser/components/newtab/lib/ASRouterFeed.jsm
@@ -1,10 +1,10 @@
-const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
-const {ASRouter} = ChromeUtils.import("resource://activity-stream/lib/ASRouter.jsm", {});
+const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
+const {ASRouter} = ChromeUtils.import("resource://activity-stream/lib/ASRouter.jsm");
/**
* @class ASRouterFeed - Connects ASRouter singleton (see above) to Activity Stream's
* store so that it can use the RemotePageManager.
*/
class ASRouterFeed {
constructor(options = {}) {
this.router = options.router || ASRouter;
diff --git browser/components/newtab/lib/ASRouterPreferences.jsm browser/components/newtab/lib/ASRouterPreferences.jsm
--- browser/components/newtab/lib/ASRouterPreferences.jsm
+++ browser/components/newtab/lib/ASRouterPreferences.jsm
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const PROVIDER_PREF_BRANCH = "browser.newtabpage.activity-stream.asrouter.providers.";
const DEVTOOLS_PREF = "browser.newtabpage.activity-stream.asrouter.devtoolsEnabled";
const DEFAULT_STATE = {
_initialized: false,
_providers: null,
_providerPrefBranch: PROVIDER_PREF_BRANCH,
diff --git browser/components/newtab/lib/ASRouterTargeting.jsm browser/components/newtab/lib/ASRouterTargeting.jsm
--- browser/components/newtab/lib/ASRouterTargeting.jsm
+++ browser/components/newtab/lib/ASRouterTargeting.jsm
@@ -1,10 +1,10 @@
-ChromeUtils.import("resource://gre/modules/components-utils/FilterExpressions.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {FilterExpressions} = ChromeUtils.import("resource://gre/modules/components-utils/FilterExpressions.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "ASRouterPreferences",
"resource://activity-stream/lib/ASRouterPreferences.jsm");
ChromeUtils.defineModuleGetter(this, "AddonManager",
"resource://gre/modules/AddonManager.jsm");
ChromeUtils.defineModuleGetter(this, "NewTabUtils",
"resource://gre/modules/NewTabUtils.jsm");
ChromeUtils.defineModuleGetter(this, "ProfileAge",
diff --git browser/components/newtab/lib/ASRouterTriggerListeners.jsm browser/components/newtab/lib/ASRouterTriggerListeners.jsm
--- browser/components/newtab/lib/ASRouterTriggerListeners.jsm
+++ browser/components/newtab/lib/ASRouterTriggerListeners.jsm
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
/**
* A Map from trigger IDs to singleton trigger listeners. Each listener must
* have idempotent `init` and `uninit` methods.
*/
diff --git browser/components/newtab/lib/AboutPreferences.jsm browser/components/newtab/lib/AboutPreferences.jsm
--- browser/components/newtab/lib/AboutPreferences.jsm
+++ browser/components/newtab/lib/AboutPreferences.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PluralForm", "resource://gre/modules/PluralForm.jsm");
-const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
+const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]);
const HTML_NS = "http://www.w3.org/1999/xhtml";
const PREFERENCES_LOADED_EVENT = "home-pane-loaded";
// These "section" objects are formatted in a way to be similar to the ones from
diff --git browser/components/newtab/lib/ActivityStream.jsm browser/components/newtab/lib/ActivityStream.jsm
--- browser/components/newtab/lib/ActivityStream.jsm
+++ browser/components/newtab/lib/ActivityStream.jsm
@@ -1,40 +1,40 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm");
ChromeUtils.defineModuleGetter(this, "UpdateUtils",
"resource://gre/modules/UpdateUtils.jsm");
// NB: Eagerly load modules that will be loaded/constructed/initialized in the
// common case to avoid the overhead of wrapping and detecting lazy loading.
-const {actionCreators: ac, actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
-const {AboutPreferences} = ChromeUtils.import("resource://activity-stream/lib/AboutPreferences.jsm", {});
-const {DefaultPrefs} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamPrefs.jsm", {});
-const {ManualMigration} = ChromeUtils.import("resource://activity-stream/lib/ManualMigration.jsm", {});
-const {NewTabInit} = ChromeUtils.import("resource://activity-stream/lib/NewTabInit.jsm", {});
-const {SectionsFeed} = ChromeUtils.import("resource://activity-stream/lib/SectionsManager.jsm", {});
-const {PlacesFeed} = ChromeUtils.import("resource://activity-stream/lib/PlacesFeed.jsm", {});
-const {PrefsFeed} = ChromeUtils.import("resource://activity-stream/lib/PrefsFeed.jsm", {});
-const {Store} = ChromeUtils.import("resource://activity-stream/lib/Store.jsm", {});
-const {SnippetsFeed} = ChromeUtils.import("resource://activity-stream/lib/SnippetsFeed.jsm", {});
-const {SystemTickFeed} = ChromeUtils.import("resource://activity-stream/lib/SystemTickFeed.jsm", {});
-const {TelemetryFeed} = ChromeUtils.import("resource://activity-stream/lib/TelemetryFeed.jsm", {});
-const {FaviconFeed} = ChromeUtils.import("resource://activity-stream/lib/FaviconFeed.jsm", {});
-const {TopSitesFeed} = ChromeUtils.import("resource://activity-stream/lib/TopSitesFeed.jsm", {});
-const {TopStoriesFeed} = ChromeUtils.import("resource://activity-stream/lib/TopStoriesFeed.jsm", {});
-const {HighlightsFeed} = ChromeUtils.import("resource://activity-stream/lib/HighlightsFeed.jsm", {});
-const {ASRouterFeed} = ChromeUtils.import("resource://activity-stream/lib/ASRouterFeed.jsm", {});
-const {DiscoveryStreamFeed} = ChromeUtils.import("resource://activity-stream/lib/DiscoveryStreamFeed.jsm", {});
+const {actionCreators: ac, actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
+const {AboutPreferences} = ChromeUtils.import("resource://activity-stream/lib/AboutPreferences.jsm");
+const {DefaultPrefs} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamPrefs.jsm");
+const {ManualMigration} = ChromeUtils.import("resource://activity-stream/lib/ManualMigration.jsm");
+const {NewTabInit} = ChromeUtils.import("resource://activity-stream/lib/NewTabInit.jsm");
+const {SectionsFeed} = ChromeUtils.import("resource://activity-stream/lib/SectionsManager.jsm");
+const {PlacesFeed} = ChromeUtils.import("resource://activity-stream/lib/PlacesFeed.jsm");
+const {PrefsFeed} = ChromeUtils.import("resource://activity-stream/lib/PrefsFeed.jsm");
+const {Store} = ChromeUtils.import("resource://activity-stream/lib/Store.jsm");
+const {SnippetsFeed} = ChromeUtils.import("resource://activity-stream/lib/SnippetsFeed.jsm");
+const {SystemTickFeed} = ChromeUtils.import("resource://activity-stream/lib/SystemTickFeed.jsm");
+const {TelemetryFeed} = ChromeUtils.import("resource://activity-stream/lib/TelemetryFeed.jsm");
+const {FaviconFeed} = ChromeUtils.import("resource://activity-stream/lib/FaviconFeed.jsm");
+const {TopSitesFeed} = ChromeUtils.import("resource://activity-stream/lib/TopSitesFeed.jsm");
+const {TopStoriesFeed} = ChromeUtils.import("resource://activity-stream/lib/TopStoriesFeed.jsm");
+const {HighlightsFeed} = ChromeUtils.import("resource://activity-stream/lib/HighlightsFeed.jsm");
+const {ASRouterFeed} = ChromeUtils.import("resource://activity-stream/lib/ASRouterFeed.jsm");
+const {DiscoveryStreamFeed} = ChromeUtils.import("resource://activity-stream/lib/DiscoveryStreamFeed.jsm");
const DEFAULT_SITES = new Map([
// This first item is the global list fallback for any unexpected geos
["", "https://www.youtube.com/,https://www.facebook.com/,https://www.wikipedia.org/,https://www.reddit.com/,https://www.amazon.com/,https://twitter.com/"],
["US", "https://www.youtube.com/,https://www.facebook.com/,https://www.amazon.com/,https://www.reddit.com/,https://www.wikipedia.org/,https://twitter.com/"],
["CA", "https://www.youtube.com/,https://www.facebook.com/,https://www.reddit.com/,https://www.wikipedia.org/,https://www.amazon.ca/,https://twitter.com/"],
["DE", "https://www.youtube.com/,https://www.facebook.com/,https://www.amazon.de/,https://www.ebay.de/,https://www.wikipedia.org/,https://www.reddit.com/"],
["PL", "https://www.youtube.com/,https://www.facebook.com/,https://allegro.pl/,https://www.wikipedia.org/,https://www.olx.pl/,https://www.wykop.pl/"],
diff --git browser/components/newtab/lib/ActivityStreamMessageChannel.jsm browser/components/newtab/lib/ActivityStreamMessageChannel.jsm
--- browser/components/newtab/lib/ActivityStreamMessageChannel.jsm
+++ browser/components/newtab/lib/ActivityStreamMessageChannel.jsm
@@ -1,19 +1,19 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource:///modules/AboutNewTab.jsm");
+const {AboutNewTab} = ChromeUtils.import("resource:///modules/AboutNewTab.jsm");
/* globals RemotePages */ // Remove when updating eslint-plugin-mozilla 0.14.0+
-ChromeUtils.import("resource://gre/modules/remotepagemanager/RemotePageManagerParent.jsm");
+const {RemotePages} = ChromeUtils.import("resource://gre/modules/remotepagemanager/RemotePageManagerParent.jsm");
-const {actionCreators: ac, actionTypes: at, actionUtils: au} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
+const {actionCreators: ac, actionTypes: at, actionUtils: au} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
const ABOUT_NEW_TAB_URL = "about:newtab";
const ABOUT_HOME_URL = "about:home";
const DEFAULT_OPTIONS = {
dispatch(action) {
throw new Error(`\nMessageChannel: Received action ${action.type}, but no dispatcher was defined.\n`);
},
diff --git browser/components/newtab/lib/ActivityStreamPrefs.jsm browser/components/newtab/lib/ActivityStreamPrefs.jsm
--- browser/components/newtab/lib/ActivityStreamPrefs.jsm
+++ browser/components/newtab/lib/ActivityStreamPrefs.jsm
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Preferences.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Preferences} = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
const ACTIVITY_STREAM_PREF_BRANCH = "browser.newtabpage.activity-stream.";
this.Prefs = class Prefs extends Preferences {
/**
* Prefs - A wrapper around Preferences that always sets the branch to
* ACTIVITY_STREAM_PREF_BRANCH
*/
diff --git browser/components/newtab/lib/CFRPageActions.jsm browser/components/newtab/lib/CFRPageActions.jsm
--- browser/components/newtab/lib/CFRPageActions.jsm
+++ browser/components/newtab/lib/CFRPageActions.jsm
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Localization.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Localization} = ChromeUtils.import("resource://gre/modules/Localization.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]);
ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
const POPUP_NOTIFICATION_ID = "contextual-feature-recommendation";
const SUMO_BASE_URL = Services.urlFormatter.formatURLPref("app.support.baseURL");
const ADDONS_API_URL = "https://services.addons.mozilla.org/api/v3/addons/addon";
diff --git browser/components/newtab/lib/DiscoveryStreamFeed.jsm browser/components/newtab/lib/DiscoveryStreamFeed.jsm
--- browser/components/newtab/lib/DiscoveryStreamFeed.jsm
+++ browser/components/newtab/lib/DiscoveryStreamFeed.jsm
@@ -1,19 +1,19 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]);
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {actionTypes: at, actionCreators: ac} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
-const {PersistentCache} = ChromeUtils.import("resource://activity-stream/lib/PersistentCache.jsm", {});
+const {actionTypes: at, actionCreators: ac} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
+const {PersistentCache} = ChromeUtils.import("resource://activity-stream/lib/PersistentCache.jsm");
const CACHE_KEY = "discovery_stream";
const LAYOUT_UPDATE_TIME = 30 * 60 * 1000; // 30 minutes
const CONFIG_PREF_NAME = "browser.newtabpage.activity-stream.discoverystream.config";
this.DiscoveryStreamFeed = class DiscoveryStreamFeed {
constructor() {
// Internal state for checking if we've intialized all our data
diff --git browser/components/newtab/lib/DownloadsManager.jsm browser/components/newtab/lib/DownloadsManager.jsm
--- browser/components/newtab/lib/DownloadsManager.jsm
+++ browser/components/newtab/lib/DownloadsManager.jsm
@@ -1,13 +1,13 @@
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
-const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
+const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
DownloadsCommon: "resource:///modules/DownloadsCommon.jsm",
DownloadsViewUI: "resource:///modules/DownloadsViewUI.jsm",
FileUtils: "resource://gre/modules/FileUtils.jsm",
});
const DOWNLOAD_CHANGED_DELAY_TIME = 1000; // time in ms to delay timer for downloads changed events
diff --git browser/components/newtab/lib/FaviconFeed.jsm browser/components/newtab/lib/FaviconFeed.jsm
--- browser/components/newtab/lib/FaviconFeed.jsm
+++ browser/components/newtab/lib/FaviconFeed.jsm
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
-const {getDomain} = ChromeUtils.import("resource://activity-stream/lib/TippyTopProvider.jsm", {});
-const {RemoteSettings} = ChromeUtils.import("resource://services-settings/remote-settings.js", {});
+const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
+const {getDomain} = ChromeUtils.import("resource://activity-stream/lib/TippyTopProvider.jsm");
+const {RemoteSettings} = ChromeUtils.import("resource://services-settings/remote-settings.js");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Services",
"resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "NewTabUtils",
"resource://gre/modules/NewTabUtils.jsm");
diff --git browser/components/newtab/lib/HighlightsFeed.jsm browser/components/newtab/lib/HighlightsFeed.jsm
--- browser/components/newtab/lib/HighlightsFeed.jsm
+++ browser/components/newtab/lib/HighlightsFeed.jsm
@@ -1,21 +1,21 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
+const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
-const {shortURL} = ChromeUtils.import("resource://activity-stream/lib/ShortURL.jsm", {});
-const {SectionsManager} = ChromeUtils.import("resource://activity-stream/lib/SectionsManager.jsm", {});
-const {TOP_SITES_DEFAULT_ROWS, TOP_SITES_MAX_SITES_PER_ROW} = ChromeUtils.import("resource://activity-stream/common/Reducers.jsm", {});
-const {Dedupe} = ChromeUtils.import("resource://activity-stream/common/Dedupe.jsm", {});
+const {shortURL} = ChromeUtils.import("resource://activity-stream/lib/ShortURL.jsm");
+const {SectionsManager} = ChromeUtils.import("resource://activity-stream/lib/SectionsManager.jsm");
+const {TOP_SITES_DEFAULT_ROWS, TOP_SITES_MAX_SITES_PER_ROW} = ChromeUtils.import("resource://activity-stream/common/Reducers.jsm");
+const {Dedupe} = ChromeUtils.import("resource://activity-stream/common/Dedupe.jsm");
ChromeUtils.defineModuleGetter(this, "filterAdult",
"resource://activity-stream/lib/FilterAdult.jsm");
ChromeUtils.defineModuleGetter(this, "LinksCache",
"resource://activity-stream/lib/LinksCache.jsm");
ChromeUtils.defineModuleGetter(this, "NewTabUtils",
"resource://gre/modules/NewTabUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Screenshots",
diff --git browser/components/newtab/lib/ManualMigration.jsm browser/components/newtab/lib/ManualMigration.jsm
--- browser/components/newtab/lib/ManualMigration.jsm
+++ browser/components/newtab/lib/ManualMigration.jsm
@@ -1,19 +1,19 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const {actionCreators: ac, actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
+const {actionCreators: ac, actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
const MIGRATION_ENDED_EVENT = "Migration:Ended";
const MS_PER_DAY = 86400000;
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "MigrationUtils", "resource:///modules/MigrationUtils.jsm");
ChromeUtils.defineModuleGetter(this, "ProfileAge", "resource://gre/modules/ProfileAge.jsm");
this.ManualMigration = class ManualMigration {
constructor() {
Services.obs.addObserver(this, MIGRATION_ENDED_EVENT);
}
diff --git browser/components/newtab/lib/NaiveBayesTextTagger.jsm browser/components/newtab/lib/NaiveBayesTextTagger.jsm
--- browser/components/newtab/lib/NaiveBayesTextTagger.jsm
+++ browser/components/newtab/lib/NaiveBayesTextTagger.jsm
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const {toksToTfIdfVector} = ChromeUtils.import("resource://activity-stream/lib/Tokenize.jsm", {});
+const {toksToTfIdfVector} = ChromeUtils.import("resource://activity-stream/lib/Tokenize.jsm");
this.NaiveBayesTextTagger = class NaiveBayesTextTagger {
constructor(model) {
this.model = model;
}
/**
* Determines if the tokenized text belongs to class according to binary naive Bayes
diff --git browser/components/newtab/lib/NewTabInit.jsm browser/components/newtab/lib/NewTabInit.jsm
--- browser/components/newtab/lib/NewTabInit.jsm
+++ browser/components/newtab/lib/NewTabInit.jsm
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const {actionCreators: ac, actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
+const {actionCreators: ac, actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
/**
* NewTabInit - A placeholder for now. This will send a copy of the state to all
* newly opened tabs.
*/
this.NewTabInit = class NewTabInit {
constructor() {
this._repliedEarlyTabs = new Map();
diff --git browser/components/newtab/lib/NmfTextTagger.jsm browser/components/newtab/lib/NmfTextTagger.jsm
--- browser/components/newtab/lib/NmfTextTagger.jsm
+++ browser/components/newtab/lib/NmfTextTagger.jsm
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const {toksToTfIdfVector} = ChromeUtils.import("resource://activity-stream/lib/Tokenize.jsm", {});
+const {toksToTfIdfVector} = ChromeUtils.import("resource://activity-stream/lib/Tokenize.jsm");
this.NmfTextTagger = class NmfTextTagger {
constructor(model) {
this.model = model;
}
/**
* A multiclass classifier that scores tokenized text against several classes through
diff --git browser/components/newtab/lib/OnboardingMessageProvider.jsm browser/components/newtab/lib/OnboardingMessageProvider.jsm
--- browser/components/newtab/lib/OnboardingMessageProvider.jsm
+++ browser/components/newtab/lib/OnboardingMessageProvider.jsm
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Localization.jsm");
-ChromeUtils.import("resource://gre/modules/FxAccountsConfig.jsm");
-ChromeUtils.import("resource:///modules/AttributionCode.jsm");
-ChromeUtils.import("resource://gre/modules/addons/AddonRepository.jsm");
+const {Localization} = ChromeUtils.import("resource://gre/modules/Localization.jsm");
+const {FxAccountsConfig} = ChromeUtils.import("resource://gre/modules/FxAccountsConfig.jsm");
+const {AttributionCode} = ChromeUtils.import("resource:///modules/AttributionCode.jsm");
+const {AddonRepository} = ChromeUtils.import("resource://gre/modules/addons/AddonRepository.jsm");
async function getAddonInfo() {
try {
let {content, source} = await AttributionCode.getAttrDataAsync();
if (!content || source !== "addons.mozilla.org") {
return null;
}
// Attribution data can be double encoded
diff --git browser/components/newtab/lib/PersistentCache.jsm browser/components/newtab/lib/PersistentCache.jsm
--- browser/components/newtab/lib/PersistentCache.jsm
+++ browser/components/newtab/lib/PersistentCache.jsm
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
XPCOMUtils.defineLazyGetter(this, "gTextDecoder", () => new TextDecoder());
/**
* A file (disk) based persistent cache of a JSON serializable object.
*/
this.PersistentCache = class PersistentCache {
diff --git browser/components/newtab/lib/PersonalityProvider.jsm browser/components/newtab/lib/PersonalityProvider.jsm
--- browser/components/newtab/lib/PersonalityProvider.jsm
+++ browser/components/newtab/lib/PersonalityProvider.jsm
@@ -1,27 +1,27 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const {RemoteSettings} = ChromeUtils.import("resource://services-settings/remote-settings.js", {});
+const {RemoteSettings} = ChromeUtils.import("resource://services-settings/remote-settings.js");
-const {actionCreators: ac} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
+const {actionCreators: ac} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
ChromeUtils.defineModuleGetter(this, "perfService", "resource://activity-stream/common/PerfService.jsm");
-const {NaiveBayesTextTagger} = ChromeUtils.import("resource://activity-stream/lib/NaiveBayesTextTagger.jsm", {});
-const {NmfTextTagger} = ChromeUtils.import("resource://activity-stream/lib/NmfTextTagger.jsm", {});
-const {RecipeExecutor} = ChromeUtils.import("resource://activity-stream/lib/RecipeExecutor.jsm", {});
+const {NaiveBayesTextTagger} = ChromeUtils.import("resource://activity-stream/lib/NaiveBayesTextTagger.jsm");
+const {NmfTextTagger} = ChromeUtils.import("resource://activity-stream/lib/NmfTextTagger.jsm");
+const {RecipeExecutor} = ChromeUtils.import("resource://activity-stream/lib/RecipeExecutor.jsm");
ChromeUtils.defineModuleGetter(this, "NewTabUtils",
"resource://gre/modules/NewTabUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]);
XPCOMUtils.defineLazyGetter(this, "gTextDecoder", () => new TextDecoder());
XPCOMUtils.defineLazyGetter(this, "baseAttachmentsURL", async () => {
const server = Services.prefs.getCharPref("services.settings.server");
const serverInfo = await (await fetch(`${server}/`)).json();
diff --git browser/components/newtab/lib/PlacesFeed.jsm browser/components/newtab/lib/PlacesFeed.jsm
--- browser/components/newtab/lib/PlacesFeed.jsm
+++ browser/components/newtab/lib/PlacesFeed.jsm
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {actionCreators: ac, actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
+const {actionCreators: ac, actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
ChromeUtils.defineModuleGetter(this, "NewTabUtils",
"resource://gre/modules/NewTabUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
const LINK_BLOCKED_EVENT = "newtab-linkBlocked";
const PLACES_LINKS_CHANGED_DELAY_TIME = 1000; // time in ms to delay timer for places links changed events
diff --git browser/components/newtab/lib/PrefsFeed.jsm browser/components/newtab/lib/PrefsFeed.jsm
--- browser/components/newtab/lib/PrefsFeed.jsm
+++ browser/components/newtab/lib/PrefsFeed.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const {actionCreators: ac, actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
-const {Prefs} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamPrefs.jsm", {});
-const {PrerenderData} = ChromeUtils.import("resource://activity-stream/common/PrerenderData.jsm", {});
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {actionCreators: ac, actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
+const {Prefs} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamPrefs.jsm");
+const {PrerenderData} = ChromeUtils.import("resource://activity-stream/common/PrerenderData.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
ChromeUtils.defineModuleGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm");
// List of prefs that require migration to indexedDB.
diff --git browser/components/newtab/lib/RecipeExecutor.jsm browser/components/newtab/lib/RecipeExecutor.jsm
--- browser/components/newtab/lib/RecipeExecutor.jsm
+++ browser/components/newtab/lib/RecipeExecutor.jsm
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const {tokenize} = ChromeUtils.import("resource://activity-stream/lib/Tokenize.jsm", {});
+const {tokenize} = ChromeUtils.import("resource://activity-stream/lib/Tokenize.jsm");
/**
* RecipeExecutor is the core feature engineering pipeline for the in-browser
* personalization work. These pipelines are called "recipes". A recipe is an
* array of objects that define a "step" in the recipe. A step is simply an
* object with a field "function" that specifies what is being done in the step
* along with other fields that are semantically defined for that step.
*
diff --git browser/components/newtab/lib/SearchShortcuts.jsm browser/components/newtab/lib/SearchShortcuts.jsm
--- browser/components/newtab/lib/SearchShortcuts.jsm
+++ browser/components/newtab/lib/SearchShortcuts.jsm
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
// List of sites we match against Topsites in order to identify sites
// that should be converted to search Topsites
const SEARCH_SHORTCUTS = [
{keyword: "@amazon", shortURL: "amazon", url: "https://amazon.com"},
{keyword: "@\u767E\u5EA6", shortURL: "baidu", url: "https://baidu.com"},
{keyword: "@google", shortURL: "google", url: "https://google.com"},
{keyword: "@\u044F\u043D\u0434\u0435\u043A\u0441", shortURL: "yandex", url: "https://yandex.com"},
diff --git browser/components/newtab/lib/SectionsManager.jsm browser/components/newtab/lib/SectionsManager.jsm
--- browser/components/newtab/lib/SectionsManager.jsm
+++ browser/components/newtab/lib/SectionsManager.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/EventEmitter.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {actionCreators: ac, actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
-const {getDefaultOptions} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamStorage.jsm", {});
+const {EventEmitter} = ChromeUtils.import("resource://gre/modules/EventEmitter.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {actionCreators: ac, actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
+const {getDefaultOptions} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamStorage.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils", "resource://gre/modules/PlacesUtils.jsm");
/*
* Generators for built in sections, keyed by the pref name for their feed.
* Built in sections may depend on options stored as serialised JSON in the pref
* `${feed_pref_name}.options`.
*/
diff --git browser/components/newtab/lib/ShortURL.jsm browser/components/newtab/lib/ShortURL.jsm
--- browser/components/newtab/lib/ShortURL.jsm
+++ browser/components/newtab/lib/ShortURL.jsm
@@ -1,10 +1,10 @@
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "IDNService", "@mozilla.org/network/idn-service;1", "nsIIDNService");
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
/**
* Properly convert internationalized domain names.
* @param {string} host Domain hostname.
diff --git browser/components/newtab/lib/SiteClassifier.jsm browser/components/newtab/lib/SiteClassifier.jsm
--- browser/components/newtab/lib/SiteClassifier.jsm
+++ browser/components/newtab/lib/SiteClassifier.jsm
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const {RemoteSettings} = ChromeUtils.import("resource://services-settings/remote-settings.js", {});
+const {RemoteSettings} = ChromeUtils.import("resource://services-settings/remote-settings.js");
// Returns whether the passed in params match the criteria.
// To match, they must contain all the params specified in criteria and the values
// must match if a value is provided in criteria.
function _hasParams(criteria, params) {
for (let param of criteria) {
const val = params.get(param.key);
if (val === null ||
diff --git browser/components/newtab/lib/SnippetsFeed.jsm browser/components/newtab/lib/SnippetsFeed.jsm
--- browser/components/newtab/lib/SnippetsFeed.jsm
+++ browser/components/newtab/lib/SnippetsFeed.jsm
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {actionTypes: at, actionCreators: ac} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {actionTypes: at, actionCreators: ac} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
ChromeUtils.defineModuleGetter(this, "AddonManager",
"resource://gre/modules/AddonManager.jsm");
ChromeUtils.defineModuleGetter(this, "ShellService",
"resource:///modules/ShellService.jsm");
ChromeUtils.defineModuleGetter(this, "ProfileAge",
"resource://gre/modules/ProfileAge.jsm");
ChromeUtils.defineModuleGetter(this, "FxAccounts",
diff --git browser/components/newtab/lib/Store.jsm browser/components/newtab/lib/Store.jsm
--- browser/components/newtab/lib/Store.jsm
+++ browser/components/newtab/lib/Store.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const {ActivityStreamMessageChannel} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamMessageChannel.jsm", {});
-const {ActivityStreamStorage} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamStorage.jsm", {});
-const {Prefs} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamPrefs.jsm", {});
-const {reducers} = ChromeUtils.import("resource://activity-stream/common/Reducers.jsm", {});
-const {redux} = ChromeUtils.import("resource://activity-stream/vendor/Redux.jsm", {});
+const {ActivityStreamMessageChannel} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamMessageChannel.jsm");
+const {ActivityStreamStorage} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamStorage.jsm");
+const {Prefs} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamPrefs.jsm");
+const {reducers} = ChromeUtils.import("resource://activity-stream/common/Reducers.jsm");
+const {redux} = ChromeUtils.import("resource://activity-stream/vendor/Redux.jsm");
/**
* Store - This has a similar structure to a redux store, but includes some extra
* functionality to allow for routing of actions between the Main processes
* and child processes via a ActivityStreamMessageChannel.
* It also accepts an array of "Feeds" on inititalization, which
* can listen for any action that is dispatched through the store.
*/
diff --git browser/components/newtab/lib/SystemTickFeed.jsm browser/components/newtab/lib/SystemTickFeed.jsm
--- browser/components/newtab/lib/SystemTickFeed.jsm
+++ browser/components/newtab/lib/SystemTickFeed.jsm
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
+const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
ChromeUtils.defineModuleGetter(this, "setInterval", "resource://gre/modules/Timer.jsm");
ChromeUtils.defineModuleGetter(this, "clearInterval", "resource://gre/modules/Timer.jsm");
// Frequency at which SYSTEM_TICK events are fired
const SYSTEM_TICK_INTERVAL = 5 * 60 * 1000;
this.SystemTickFeed = class SystemTickFeed {
diff --git browser/components/newtab/lib/TelemetryFeed.jsm browser/components/newtab/lib/TelemetryFeed.jsm
--- browser/components/newtab/lib/TelemetryFeed.jsm
+++ browser/components/newtab/lib/TelemetryFeed.jsm
@@ -1,21 +1,21 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* globals Services */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-const {actionTypes: at, actionUtils: au} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
-const {Prefs} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamPrefs.jsm", {});
-const {classifySite} = ChromeUtils.import("resource://activity-stream/lib/SiteClassifier.jsm", {});
+const {actionTypes: at, actionUtils: au} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
+const {Prefs} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamPrefs.jsm");
+const {classifySite} = ChromeUtils.import("resource://activity-stream/lib/SiteClassifier.jsm");
ChromeUtils.defineModuleGetter(this, "ASRouterPreferences",
"resource://activity-stream/lib/ASRouterPreferences.jsm");
ChromeUtils.defineModuleGetter(this, "perfService",
"resource://activity-stream/common/PerfService.jsm");
ChromeUtils.defineModuleGetter(this, "PingCentre",
"resource:///modules/PingCentre.jsm");
ChromeUtils.defineModuleGetter(this, "UTEventReporting",
diff --git browser/components/newtab/lib/TippyTopProvider.jsm browser/components/newtab/lib/TippyTopProvider.jsm
--- browser/components/newtab/lib/TippyTopProvider.jsm
+++ browser/components/newtab/lib/TippyTopProvider.jsm
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["fetch", "URL"]);
const TIPPYTOP_JSON_PATH = "resource://activity-stream/data/content/tippytop/top_sites.json";
const TIPPYTOP_URL_PREFIX = "resource://activity-stream/data/content/tippytop/images/";
function getDomain(url) {
let domain;
diff --git browser/components/newtab/lib/TopSitesFeed.jsm browser/components/newtab/lib/TopSitesFeed.jsm
--- browser/components/newtab/lib/TopSitesFeed.jsm
+++ browser/components/newtab/lib/TopSitesFeed.jsm
@@ -1,30 +1,30 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-const {actionCreators: ac, actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
-const {TippyTopProvider} = ChromeUtils.import("resource://activity-stream/lib/TippyTopProvider.jsm", {});
-const {insertPinned, TOP_SITES_MAX_SITES_PER_ROW} = ChromeUtils.import("resource://activity-stream/common/Reducers.jsm", {});
-const {Dedupe} = ChromeUtils.import("resource://activity-stream/common/Dedupe.jsm", {});
-const {shortURL} = ChromeUtils.import("resource://activity-stream/lib/ShortURL.jsm", {});
-const {getDefaultOptions} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamStorage.jsm", {});
+const {actionCreators: ac, actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
+const {TippyTopProvider} = ChromeUtils.import("resource://activity-stream/lib/TippyTopProvider.jsm");
+const {insertPinned, TOP_SITES_MAX_SITES_PER_ROW} = ChromeUtils.import("resource://activity-stream/common/Reducers.jsm");
+const {Dedupe} = ChromeUtils.import("resource://activity-stream/common/Dedupe.jsm");
+const {shortURL} = ChromeUtils.import("resource://activity-stream/lib/ShortURL.jsm");
+const {getDefaultOptions} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamStorage.jsm");
const {
CUSTOM_SEARCH_SHORTCUTS,
SEARCH_SHORTCUTS_EXPERIMENT,
SEARCH_SHORTCUTS_SEARCH_ENGINES_PREF,
SEARCH_SHORTCUTS_HAVE_PINNED_PREF,
checkHasSearchEngine,
getSearchProvider,
-} = ChromeUtils.import("resource://activity-stream/lib/SearchShortcuts.jsm", {});
+} = ChromeUtils.import("resource://activity-stream/lib/SearchShortcuts.jsm");
ChromeUtils.defineModuleGetter(this, "filterAdult",
"resource://activity-stream/lib/FilterAdult.jsm");
ChromeUtils.defineModuleGetter(this, "LinksCache",
"resource://activity-stream/lib/LinksCache.jsm");
ChromeUtils.defineModuleGetter(this, "NewTabUtils",
"resource://gre/modules/NewTabUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Screenshots",
diff --git browser/components/newtab/lib/TopStoriesFeed.jsm browser/components/newtab/lib/TopStoriesFeed.jsm
--- browser/components/newtab/lib/TopStoriesFeed.jsm
+++ browser/components/newtab/lib/TopStoriesFeed.jsm
@@ -1,25 +1,25 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/NewTabUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {NewTabUtils} = ChromeUtils.import("resource://gre/modules/NewTabUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]);
-const {actionTypes: at, actionCreators: ac} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {});
-const {Prefs} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamPrefs.jsm", {});
-const {shortURL} = ChromeUtils.import("resource://activity-stream/lib/ShortURL.jsm", {});
-const {SectionsManager} = ChromeUtils.import("resource://activity-stream/lib/SectionsManager.jsm", {});
-const {UserDomainAffinityProvider} = ChromeUtils.import("resource://activity-stream/lib/UserDomainAffinityProvider.jsm", {});
-const {PersonalityProvider} = ChromeUtils.import("resource://activity-stream/lib/PersonalityProvider.jsm", {});
-const {PersistentCache} = ChromeUtils.import("resource://activity-stream/lib/PersistentCache.jsm", {});
+const {actionTypes: at, actionCreators: ac} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
+const {Prefs} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamPrefs.jsm");
+const {shortURL} = ChromeUtils.import("resource://activity-stream/lib/ShortURL.jsm");
+const {SectionsManager} = ChromeUtils.import("resource://activity-stream/lib/SectionsManager.jsm");
+const {UserDomainAffinityProvider} = ChromeUtils.import("resource://activity-stream/lib/UserDomainAffinityProvider.jsm");
+const {PersonalityProvider} = ChromeUtils.import("resource://activity-stream/lib/PersonalityProvider.jsm");
+const {PersistentCache} = ChromeUtils.import("resource://activity-stream/lib/PersistentCache.jsm");
ChromeUtils.defineModuleGetter(this, "perfService", "resource://activity-stream/common/PerfService.jsm");
ChromeUtils.defineModuleGetter(this, "pktApi", "chrome://pocket/content/pktApi.jsm");
const STORIES_UPDATE_TIME = 30 * 60 * 1000; // 30 minutes
const TOPICS_UPDATE_TIME = 3 * 60 * 60 * 1000; // 3 hours
const STORIES_NOW_THRESHOLD = 24 * 60 * 60 * 1000; // 24 hours
const MIN_DOMAIN_AFFINITIES_UPDATE_TIME = 12 * 60 * 60 * 1000; // 12 hours
diff --git browser/components/newtab/lib/UTEventReporting.jsm browser/components/newtab/lib/UTEventReporting.jsm
--- browser/components/newtab/lib/UTEventReporting.jsm
+++ browser/components/newtab/lib/UTEventReporting.jsm
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* globals Services */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
/**
* Note: the schema can be found in
* https://searchfox.org/mozilla-central/source/toolkit/components/telemetry/Events.yaml
*/
const EXTRAS_FIELD_NAMES = ["addon_version", "session_id", "page", "user_prefs", "action_position"];
this.UTEventReporting = class UTEventReporting {
diff --git browser/components/newtab/lib/UserDomainAffinityProvider.jsm browser/components/newtab/lib/UserDomainAffinityProvider.jsm
--- browser/components/newtab/lib/UserDomainAffinityProvider.jsm
+++ browser/components/newtab/lib/UserDomainAffinityProvider.jsm
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
const DEFAULT_TIME_SEGMENTS = [
{"id": "hour", "startTime": 3600, "endTime": 0, "weightPosition": 1},
{"id": "day", "startTime": 86400, "endTime": 3600, "weightPosition": 0.75},
{"id": "week", "startTime": 604800, "endTime": 86400, "weightPosition": 0.5},
diff --git browser/components/newtab/test/browser/browser_asrouter_cfr.js browser/components/newtab/test/browser/browser_asrouter_cfr.js
--- browser/components/newtab/test/browser/browser_asrouter_cfr.js
+++ browser/components/newtab/test/browser/browser_asrouter_cfr.js
@@ -1,14 +1,14 @@
const {CFRPageActions} =
- ChromeUtils.import("resource://activity-stream/lib/CFRPageActions.jsm", {});
+ ChromeUtils.import("resource://activity-stream/lib/CFRPageActions.jsm");
const {ASRouterTriggerListeners} =
- ChromeUtils.import("resource://activity-stream/lib/ASRouterTriggerListeners.jsm", {});
+ ChromeUtils.import("resource://activity-stream/lib/ASRouterTriggerListeners.jsm");
const {ASRouter} =
- ChromeUtils.import("resource://activity-stream/lib/ASRouter.jsm", {});
+ ChromeUtils.import("resource://activity-stream/lib/ASRouter.jsm");
function trigger_cfr_panel(browser, trigger, action = {type: "FOO"}) { // a fake action type will result in the action being ignored
return CFRPageActions.addRecommendation(
browser,
trigger,
{
content: {
notification_text: "Mochitest",
diff --git browser/components/newtab/test/browser/browser_asrouter_targeting.js browser/components/newtab/test/browser/browser_asrouter_targeting.js
--- browser/components/newtab/test/browser/browser_asrouter_targeting.js
+++ browser/components/newtab/test/browser/browser_asrouter_targeting.js
@@ -1,12 +1,12 @@
const {ASRouterTargeting, QueryCache} =
- ChromeUtils.import("resource://activity-stream/lib/ASRouterTargeting.jsm", {});
+ ChromeUtils.import("resource://activity-stream/lib/ASRouterTargeting.jsm");
const {AddonTestUtils} =
- ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm", {});
+ ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
ChromeUtils.defineModuleGetter(this, "ProfileAge",
"resource://gre/modules/ProfileAge.jsm");
ChromeUtils.defineModuleGetter(this, "AddonManager",
"resource://gre/modules/AddonManager.jsm");
ChromeUtils.defineModuleGetter(this, "ShellService",
"resource:///modules/ShellService.jsm");
ChromeUtils.defineModuleGetter(this, "NewTabUtils",
"resource://gre/modules/NewTabUtils.jsm");
diff --git browser/components/newtab/test/browser/browser_enabled_newtabpage.js browser/components/newtab/test/browser/browser_enabled_newtabpage.js
--- browser/components/newtab/test/browser/browser_enabled_newtabpage.js
+++ browser/components/newtab/test/browser/browser_enabled_newtabpage.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
function checkSpec(uri, check, message) {
const {spec} = NetUtil.newChannel({
loadUsingSystemPrincipal: true,
uri,
}).URI;
info(`got ${spec} for ${uri}`);
diff --git browser/components/newtab/test/browser/browser_newtab_overrides.js browser/components/newtab/test/browser/browser_newtab_overrides.js
--- browser/components/newtab/test/browser/browser_newtab_overrides.js
+++ browser/components/newtab/test/browser/browser_newtab_overrides.js
@@ -1,12 +1,12 @@
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "aboutNewTabService",
"@mozilla.org/browser/aboutnewtab-service;1",
"nsIAboutNewTabService");
registerCleanupFunction(() => {
aboutNewTabService.resetNewTabURL();
});
diff --git browser/components/newtab/test/browser/browser_packaged_as_locales.js browser/components/newtab/test/browser/browser_packaged_as_locales.js
--- browser/components/newtab/test/browser/browser_packaged_as_locales.js
+++ browser/components/newtab/test/browser/browser_packaged_as_locales.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "aboutNewTabService",
"@mozilla.org/browser/aboutnewtab-service;1",
"nsIAboutNewTabService");
// Tests are by default run with non-debug en-US configuration
const DEFAULT_URL = SpecialPowers.getBoolPref("browser.tabs.remote.separatePrivilegedContentProcess") ?
"resource://activity-stream/prerendered/en-US/activity-stream-prerendered-noscripts.html" :
"resource://activity-stream/prerendered/en-US/activity-stream-prerendered.html";
diff --git browser/components/newtab/test/xpcshell/test_ASRouterTargeting_attribution.js browser/components/newtab/test/xpcshell/test_ASRouterTargeting_attribution.js
--- browser/components/newtab/test/xpcshell/test_ASRouterTargeting_attribution.js
+++ browser/components/newtab/test/xpcshell/test_ASRouterTargeting_attribution.js
@@ -1,17 +1,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/AttributionCode.jsm");
-ChromeUtils.import("resource://activity-stream/lib/ASRouterTargeting.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AttributionCode} = ChromeUtils.import("resource:///modules/AttributionCode.jsm");
+const {ASRouterTargeting} = ChromeUtils.import("resource://activity-stream/lib/ASRouterTargeting.jsm");
add_task(async function check_attribution_data() {
// Some setup to fake the correct attribution data
const appPath = Services.dirsvc.get("GreD", Ci.nsIFile).parent.parent.path;
const attributionSvc = Cc["@mozilla.org/mac-attribution;1"]
.getService(Ci.nsIMacAttributionService);
const campaign = "non-fx-button";
const source = "addons.mozilla.org";
diff --git browser/components/newtab/test/xpcshell/test_AboutNewTabService.js browser/components/newtab/test/xpcshell/test_AboutNewTabService.js
--- browser/components/newtab/test/xpcshell/test_AboutNewTabService.js
+++ browser/components/newtab/test/xpcshell/test_AboutNewTabService.js
@@ -1,18 +1,18 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Preferences.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "aboutNewTabService",
"@mozilla.org/browser/aboutnewtab-service;1",
"nsIAboutNewTabService");
const IS_RELEASE_OR_BETA = AppConstants.RELEASE_OR_BETA;
const DOWNLOADS_URL = "chrome://browser/content/downloads/contentAreaDownloadsView.xul";
const SEPARATE_PRIVILEGED_CONTENT_PROCESS_PREF = "browser.tabs.remote.separatePrivilegedContentProcess";
diff --git browser/components/nsBrowserContentHandler.js browser/components/nsBrowserContentHandler.js
--- browser/components/nsBrowserContentHandler.js
+++ browser/components/nsBrowserContentHandler.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
HeadlessShell: "resource:///modules/HeadlessShell.jsm",
HomePage: "resource:///modules/HomePage.jsm",
LaterRun: "resource:///modules/LaterRun.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
diff --git browser/components/nsBrowserGlue.js browser/components/nsBrowserGlue.js
--- browser/components/nsBrowserGlue.js
+++ browser/components/nsBrowserGlue.js
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
ChromeUtils.defineModuleGetter(this, "ActorManagerParent",
"resource://gre/modules/ActorManagerParent.jsm");
const PREF_PDFJS_ENABLED_CACHE_STATE = "pdfjs.enabledCache.state";
let ACTORS = {
AboutReader: {
@@ -353,17 +353,17 @@ let ACTORS = {
// Set this before showing the window so that graphics code can use it to
// decide to skip some expensive code paths (eg. starting the GPU process).
docElt.setAttribute("windowtype", "navigator:blank");
// The window becomes visible after OnStopRequest, so make this happen now.
win.stop();
let { TelemetryTimestamps } =
- ChromeUtils.import("resource://gre/modules/TelemetryTimestamps.jsm", {});
+ ChromeUtils.import("resource://gre/modules/TelemetryTimestamps.jsm");
TelemetryTimestamps.add("blankWindowShown");
})();
XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]);
XPCOMUtils.defineLazyServiceGetters(this, {
WindowsUIUtils: ["@mozilla.org/windows-ui-utils;1", "nsIWindowsUIUtils"],
aboutNewTabService: ["@mozilla.org/browser/aboutnewtab-service;1", "nsIAboutNewTabService"],
@@ -588,17 +588,17 @@ const STARTUP_CRASHES_END_DELAY_MS = 30
const OBSERVE_LASTWINDOW_CLOSE_TOPICS = AppConstants.platform != "macosx";
function BrowserGlue() {
XPCOMUtils.defineLazyServiceGetter(this, "_idleService",
"@mozilla.org/widget/idleservice;1",
"nsIIdleService");
XPCOMUtils.defineLazyGetter(this, "_distributionCustomizer", function() {
- ChromeUtils.import("resource:///modules/distribution.js");
+ const {DistributionCustomizer} = ChromeUtils.import("resource:///modules/distribution.js");
return new DistributionCustomizer();
});
XPCOMUtils.defineLazyServiceGetter(this, "AlertsService", "@mozilla.org/alerts-service;1", "nsIAlertsService");
this._init();
}
@@ -638,17 +638,17 @@ BrowserGlue.prototype = {
// shutting down, so instead of just ignoring that window we abort.
if (win.closed || !win.gBrowser) {
return;
}
delay += win.gBrowser.tabs.length;
}
delay = delay <= MAX_DELAY ? delay : MAX_DELAY;
- ChromeUtils.import("resource://services-sync/main.js");
+ const {Weave} = ChromeUtils.import("resource://services-sync/main.js");
Weave.Service.scheduler.delayedAutoConnect(delay);
},
/**
* Lazily initialize PingCentre
*/
get pingCentre() {
const MAIN_TOPIC_ID = "main";
@@ -1229,17 +1229,17 @@ BrowserGlue.prototype = {
* String of either "unused" or "uninstall", specifying the reason
* why a profile reset is offered.
*/
_resetProfileNotification(reason) {
let win = BrowserWindowTracker.getTopWindow();
if (!win)
return;
- ChromeUtils.import("resource://gre/modules/ResetProfile.jsm");
+ const {ResetProfile} = ChromeUtils.import("resource://gre/modules/ResetProfile.jsm");
if (!ResetProfile.resetSupported())
return;
let productName = gBrandBundle.GetStringFromName("brandShortName");
let resetBundle = Services.strings
.createBundle("chrome://global/locale/resetProfile.properties");
let message;
@@ -1301,17 +1301,17 @@ BrowserGlue.prototype = {
}
ProcessHangMonitor.init();
// A channel for "remote troubleshooting" code...
let channel = new WebChannel("remote-troubleshooting", "remote-troubleshooting");
channel.listen((id, data, target) => {
if (data.command == "request") {
- let {Troubleshoot} = ChromeUtils.import("resource://gre/modules/Troubleshoot.jsm", {});
+ let {Troubleshoot} = ChromeUtils.import("resource://gre/modules/Troubleshoot.jsm");
Troubleshoot.snapshot(snapshotData => {
// for privacy we remove crash IDs and all preferences (but bug 1091944
// exists to expose prefs once we are confident of privacy implications)
delete snapshotData.crashes;
delete snapshotData.modifiedPreferences;
channel.send(snapshotData, target);
});
}
@@ -1609,17 +1609,17 @@ BrowserGlue.prototype = {
SafeBrowsing.init();
}, 5000);
if (AppConstants.MOZ_CRASHREPORTER) {
UnsubmittedCrashHandler.scheduleCheckForUnsubmittedCrashReports();
}
if (AppConstants.ASAN_REPORTER) {
- ChromeUtils.import("resource:///modules/AsanReporter.jsm");
+ var {AsanReporter} = ChromeUtils.import("resource:///modules/AsanReporter.jsm");
AsanReporter.init();
}
if (AppConstants.platform == "win") {
Services.tm.idleDispatchToMainThread(() => {
// For Windows 7, initialize the jump list module.
const WINTASKBAR_CONTRACTID = "@mozilla.org/windows-taskbar;1";
if (WINTASKBAR_CONTRACTID in Cc &&
@@ -1637,17 +1637,17 @@ BrowserGlue.prototype = {
});
}
Services.tm.idleDispatchToMainThread(() => {
this._checkForDefaultBrowser();
});
Services.tm.idleDispatchToMainThread(() => {
- let {setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm", {});
+ let {setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
setTimeout(function() {
Services.tm.idleDispatchToMainThread(Services.startup.trackStartupCrashEnd);
}, STARTUP_CRASHES_END_DELAY_MS);
});
Services.tm.idleDispatchToMainThread(() => {
let handlerService = Cc["@mozilla.org/uriloader/handler-service;1"].
getService(Ci.nsIHandlerService);
@@ -2738,17 +2738,17 @@ BrowserGlue.prototype = {
// should not exist otherwise (normally).
let prefName = "browser.urlbar.matchBuckets";
let prefValue = Services.prefs.getCharPref(prefName, "");
// Get the study (aka experiment). It may not be installed.
let experiment = null;
let experimentName = "pref-flip-search-composition-57-release-1413565";
let {PreferenceExperiments} =
- ChromeUtils.import("resource://normandy/lib/PreferenceExperiments.jsm", {});
+ ChromeUtils.import("resource://normandy/lib/PreferenceExperiments.jsm");
try {
experiment = await PreferenceExperiments.get(experimentName);
} catch (e) {}
// Uninstall the study, resetting the pref to its state before the study.
if (experiment && !experiment.expired) {
await PreferenceExperiments.stop(experimentName, {
resetValue: true,
diff --git browser/components/originattributes/test/browser/browser_favicon_firstParty.js browser/components/originattributes/test/browser/browser_favicon_firstParty.js
--- browser/components/originattributes/test/browser/browser_favicon_firstParty.js
+++ browser/components/originattributes/test/browser/browser_favicon_firstParty.js
@@ -1,15 +1,15 @@
/**
* Bug 1277803 - A test case for testing favicon loading across different first party domains.
*/
const CC = Components.Constructor;
-ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
+const {PlacesUtils} = ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
let EventUtils = {};
Services.scriptloader.loadSubScript(
"chrome://mochikit/content/tests/SimpleTest/EventUtils.js", EventUtils);
const FIRST_PARTY_ONE = "example.com";
const FIRST_PARTY_TWO = "example.org";
const THIRD_PARTY = "mochi.test:8888";
diff --git browser/components/originattributes/test/browser/browser_httpauth.js browser/components/originattributes/test/browser/browser_httpauth.js
--- browser/components/originattributes/test/browser/browser_httpauth.js
+++ browser/components/originattributes/test/browser/browser_httpauth.js
@@ -1,9 +1,9 @@
-let {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js", {});
+let {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js");
let server = new HttpServer();
server.registerPathHandler("/file.html", fileHandler);
server.start(-1);
let BASE_URI = "http://localhost:" + server.identity.primaryPort;
let FILE_URI = BASE_URI + "/file.html";
diff --git browser/components/originattributes/test/browser/browser_imageCacheIsolation.js browser/components/originattributes/test/browser/browser_imageCacheIsolation.js
--- browser/components/originattributes/test/browser/browser_imageCacheIsolation.js
+++ browser/components/originattributes/test/browser/browser_imageCacheIsolation.js
@@ -1,15 +1,15 @@
/*
* Bug 1264572 - A test case for image cache isolation.
*/
requestLongerTimeout(2);
-let {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js", {});
+let {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js");
const NUM_ISOLATION_LOADS = 2;
const NUM_CACHED_LOADS = 1;
let gHits = 0;
let server = new HttpServer();
server.registerPathHandler("/image.png", imageHandler);
diff --git browser/components/originattributes/test/browser/browser_sanitize.js browser/components/originattributes/test/browser/browser_sanitize.js
--- browser/components/originattributes/test/browser/browser_sanitize.js
+++ browser/components/originattributes/test/browser/browser_sanitize.js
@@ -1,17 +1,17 @@
/**
* Bug 1270338 - Add a mochitest to ensure Sanitizer clears data for all containers
*/
const CC = Components.Constructor;
const TEST_DOMAIN = "http://example.net/";
-const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm", {});
+const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm");
function setCookies(aBrowser) {
ContentTask.spawn(aBrowser, null, function() {
content.document.cookie = "key=value";
});
}
function cacheDataForContext(loadContextInfo) {
diff --git browser/components/payments/content/paymentDialogFrameScript.js browser/components/payments/content/paymentDialogFrameScript.js
--- browser/components/payments/content/paymentDialogFrameScript.js
+++ browser/components/payments/content/paymentDialogFrameScript.js
@@ -15,32 +15,32 @@
* Business logic should stay out of this shim.
*/
"use strict";
/* eslint-env mozilla/frame-script */
/* global Services */
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "FormAutofill",
"resource://formautofill/FormAutofill.jsm");
ChromeUtils.defineModuleGetter(this, "FormAutofillUtils",
"resource://formautofill/FormAutofillUtils.jsm");
ChromeUtils.defineModuleGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm");
const SAVE_CREDITCARD_DEFAULT_PREF = "dom.payments.defaults.saveCreditCard";
const SAVE_ADDRESS_DEFAULT_PREF = "dom.payments.defaults.saveAddress";
let PaymentFrameScript = {
init() {
XPCOMUtils.defineLazyGetter(this, "log", () => {
- let {ConsoleAPI} = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
+ let {ConsoleAPI} = ChromeUtils.import("resource://gre/modules/Console.jsm");
return new ConsoleAPI({
maxLogLevelPref: "dom.payments.loglevel",
prefix: "paymentDialogFrameScript",
});
});
addEventListener("paymentContentToChrome", this, false, true);
diff --git browser/components/payments/content/paymentDialogWrapper.js browser/components/payments/content/paymentDialogWrapper.js
--- browser/components/payments/content/paymentDialogWrapper.js
+++ browser/components/payments/content/paymentDialogWrapper.js
@@ -12,19 +12,19 @@
"use strict";
const paymentSrv = Cc["@mozilla.org/dom/payments/payment-request-service;1"]
.getService(Ci.nsIPaymentRequestService);
const paymentUISrv = Cc["@mozilla.org/dom/payments/payment-ui-service;1"]
.getService(Ci.nsIPaymentUIService);
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "BrowserWindowTracker",
"resource:///modules/BrowserWindowTracker.jsm");
ChromeUtils.defineModuleGetter(this, "FormAutofillUtils",
"resource://formautofill/FormAutofillUtils.jsm");
ChromeUtils.defineModuleGetter(this, "OSKeyStore",
"resource://formautofill/OSKeyStore.jsm");
ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
@@ -540,17 +540,17 @@ var paymentDialogWrapper = {
debugFrame() {
// To avoid self-XSS-type attacks, ensure that Browser Chrome debugging is enabled.
if (!Services.prefs.getBoolPref("devtools.chrome.enabled", false)) {
Cu.reportError("devtools.chrome.enabled must be enabled to debug the frame");
return;
}
let {
gDevToolsBrowser,
- } = ChromeUtils.import("resource://devtools/client/framework/gDevTools.jsm", {});
+ } = ChromeUtils.import("resource://devtools/client/framework/gDevTools.jsm");
gDevToolsBrowser.openContentProcessToolbox({
selectedBrowser: this.frameWeakRef.get(),
});
},
onOpenPreferences() {
BrowserWindowTracker.getTopWindow().openPreferences("privacy-form-autofill");
},
diff --git browser/components/payments/paymentUIService.js browser/components/payments/paymentUIService.js
--- browser/components/payments/paymentUIService.js
+++ browser/components/payments/paymentUIService.js
@@ -12,31 +12,31 @@
* For now the UI is shown in a native dialog but that is likely to change.
* Tests should try to avoid relying on that implementation detail.
*/
"use strict";
const XHTML_NS = "http://www.w3.org/1999/xhtml";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "BrowserWindowTracker",
"resource:///modules/BrowserWindowTracker.jsm");
XPCOMUtils.defineLazyServiceGetter(this,
"paymentSrv",
"@mozilla.org/dom/payments/payment-request-service;1",
"nsIPaymentRequestService");
function PaymentUIService() {
this.wrappedJSObject = this;
XPCOMUtils.defineLazyGetter(this, "log", () => {
- let {ConsoleAPI} = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
+ let {ConsoleAPI} = ChromeUtils.import("resource://gre/modules/Console.jsm");
return new ConsoleAPI({
maxLogLevelPref: "dom.payments.loglevel",
prefix: "Payment UI Service",
});
});
this.log.debug("constructor");
}
diff --git browser/components/payments/test/PaymentTestUtils.jsm browser/components/payments/test/PaymentTestUtils.jsm
--- browser/components/payments/test/PaymentTestUtils.jsm
+++ browser/components/payments/test/PaymentTestUtils.jsm
@@ -258,17 +258,17 @@ var PaymentTestUtils = {
* Don't await on this task since the cancel can close the dialog before
* ContentTask can resolve the promise.
*
* @returns {undefined}
*/
completePayment: async () => {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "payment-summary";
}, "Wait for change to payment-summary before clicking Pay");
let button = content.document.getElementById("pay");
ok(!button.disabled, "Pay button should not be disabled when clicking it");
button.click();
@@ -282,17 +282,17 @@ var PaymentTestUtils = {
Cu.unwaiveXrays(picker.securityCodeInput).querySelector("input").setUserInput(securityCode);
},
},
DialogContentUtils: {
waitForState: async (content, stateCheckFn, msg) => {
const {
ContentTaskUtils,
- } = ChromeUtils.import("resource://testing-common/ContentTaskUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/ContentTaskUtils.jsm");
let {requestStore} = Cu.waiveXrays(content.document.querySelector("payment-dialog"));
await ContentTaskUtils.waitForCondition(() => stateCheckFn(requestStore.getState()), msg);
return requestStore.getState();
},
getCurrentState: async (content) => {
let {requestStore} = Cu.waiveXrays(content.document.querySelector("payment-dialog"));
return requestStore.getState();
diff --git browser/components/payments/test/browser/browser_address_edit.js browser/components/payments/test/browser/browser_address_edit.js
--- browser/components/payments/test/browser/browser_address_edit.js
+++ browser/components/payments/test/browser/browser_address_edit.js
@@ -35,17 +35,17 @@ add_task(async function test_add_link()
merchantTaskFn: PTU.ContentTasks.createAndShowRequest,
}
);
info("setup got prefilledGuids: " + JSON.stringify(prefilledGuids));
await spawnPaymentDialogTask(frame, async () => {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let {tempAddresses, savedAddresses} = await PTU.DialogContentUtils.getCurrentState(content);
is(Object.keys(tempAddresses).length, 0, "No temporary addresses at the start of test");
is(Object.keys(savedAddresses).length, 1, "1 saved address at the start of test");
});
let testOptions = [
{ setPersistCheckedValue: true, expectPersist: true },
@@ -62,17 +62,17 @@ add_task(async function test_add_link()
await manuallyAddShippingAddress(frame, newAddress, options);
await shippingAddressChangePromise;
info("got shippingaddresschange event");
await spawnPaymentDialogTask(frame, async ({address, options, prefilledGuids}) => {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let newAddresses = await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.tempAddresses && state.savedAddresses;
});
let colnName = options.expectPersist ? "savedAddresses" : "tempAddresses";
// remove any pre-filled entries
delete newAddresses[colnName][prefilledGuids.address1GUID];
@@ -115,17 +115,17 @@ add_task(async function test_edit_link()
"family-name": "swaJ",
"organization": "aliizoM",
};
info("setup got prefilledGuids: " + JSON.stringify(prefilledGuids));
await spawnPaymentDialogTask(frame, async () => {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let {tempAddresses, savedAddresses} = await PTU.DialogContentUtils.getCurrentState(content);
is(Object.keys(tempAddresses).length, 0, "No temporary addresses at the start of test");
is(Object.keys(savedAddresses).length, 1, "1 saved address at the start of test");
let picker = content.document
.querySelector("address-picker[selected-state-key='selectedShippingAddress']");
Cu.waiveXrays(picker).dropdown.popupBox.focus();
@@ -157,17 +157,17 @@ add_task(async function test_edit_link()
};
await fillInShippingAddressForm(frame, EXPECTED_ADDRESS, editOptions);
await verifyPersistCheckbox(frame, editOptions);
await submitAddressForm(frame, EXPECTED_ADDRESS, editOptions);
await spawnPaymentDialogTask(frame, async (address) => {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let state = await PTU.DialogContentUtils.waitForState(content, (state) => {
let addresses = Object.entries(state.savedAddresses);
return addresses.length == 1 &&
addresses[0][1]["given-name"] == address["given-name"];
}, "Check address was edited");
let addressGUIDs = Object.keys(state.savedAddresses);
@@ -224,17 +224,17 @@ add_task(async function test_add_payer_c
initialPageId: "payment-summary",
addressPageId: "payer-address-page",
expectPersist: true,
};
await spawnPaymentDialogTask(frame, async () => {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let {tempAddresses, savedAddresses} = await PTU.DialogContentUtils.getCurrentState(content);
is(Object.keys(tempAddresses).length, 0, "No temporary addresses at the start of test");
is(Object.keys(savedAddresses).length, 1, "1 saved address at the start of test");
});
await navigateToAddAddressPage(frame, addOptions);
@@ -257,17 +257,17 @@ add_task(async function test_add_payer_c
await fillInPayerAddressForm(frame, EXPECTED_ADDRESS, addOptions);
await verifyPersistCheckbox(frame, addOptions);
await submitAddressForm(frame, EXPECTED_ADDRESS, addOptions);
await spawnPaymentDialogTask(frame, async (address) => {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let {savedAddresses} = await PTU.DialogContentUtils.getCurrentState(content);
let addressGUIDs = Object.keys(savedAddresses);
is(addressGUIDs.length, 2, "Check there are now 2 addresses");
let savedAddress = savedAddresses[addressGUIDs[1]];
for (let [key, val] of Object.entries(address)) {
is(savedAddress[key], val, "Check " + key);
@@ -312,17 +312,17 @@ add_task(async function test_edit_payer_
addressPageId: "payer-address-page",
expectPersist: true,
isEditing: true,
};
await spawnPaymentDialogTask(frame, async (address) => {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return Object.keys(state.savedAddresses).length == 1;
}, "One saved addresses when starting test");
let editLink =
content.document.querySelector("address-picker.payer-related .edit-link");
is(editLink.textContent, "Edit", "Edit link text");
@@ -363,17 +363,17 @@ add_task(async function test_edit_payer_
}, EXPECTED_ADDRESS);
await verifyPersistCheckbox(frame, editOptions);
await submitAddressForm(frame, EXPECTED_ADDRESS, editOptions);
await spawnPaymentDialogTask(frame, async (address) => {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let state = await PTU.DialogContentUtils.waitForState(content, (state) => {
let addresses = Object.entries(state.savedAddresses);
return addresses.length == 1 &&
addresses[0][1]["given-name"] == address["given-name"] + "1";
}, "Check address was edited");
let addressGUIDs = Object.keys(state.savedAddresses);
@@ -408,18 +408,18 @@ add_task(async function test_shipping_ad
options: PTU.Options.requestShippingOption,
merchantTaskFn: PTU.ContentTasks.createAndShowRequest,
}
);
await spawnPaymentDialogTask(frame, async function test_picker_option_label(address) {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
- ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
+ const {FormAutofillUtils} = ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
let state = await PTU.DialogContentUtils.waitForState(content, (state) => {
return Object.keys(state.savedAddresses).length == 1;
}, "One saved addresses when starting test");
let savedAddress = Object.values(state.savedAddresses)[0];
let selector = "address-picker[selected-state-key='selectedShippingAddress']";
let picker = content.document.querySelector(selector);
@@ -448,18 +448,18 @@ add_task(async function test_payer_addre
options: PTU.Options.requestPayerNameEmailAndPhone,
merchantTaskFn: PTU.ContentTasks.createAndShowRequest,
}
);
await spawnPaymentDialogTask(frame, async function test_picker_option_label(address) {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
- ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
+ const {FormAutofillUtils} = ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
let state = await PTU.DialogContentUtils.waitForState(content, (state) => {
return Object.keys(state.savedAddresses).length == 1;
}, "One saved addresses when starting test");
let savedAddress = Object.values(state.savedAddresses)[0];
let selector = "address-picker[selected-state-key='selectedPayerAddress']";
let picker = content.document.querySelector(selector);
@@ -517,17 +517,17 @@ add_task(async function test_private_per
expectPersist: false,
isPrivate: true,
};
await navigateToAddAddressPage(frame, addOptions);
await spawnPaymentDialogTask(frame, async () => {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let state = await PTU.DialogContentUtils.getCurrentState(content);
info("on address-page and state.isPrivate: " + state.isPrivate);
ok(state.isPrivate,
"isPrivate flag is set when paymentrequest is shown in a private session");
});
info("wait for initialAddresses");
@@ -557,17 +557,17 @@ add_task(async function test_private_per
await ContentTask.spawn(browser, {
eventName: "shippingaddresschange",
}, PTU.ContentTasks.awaitPaymentEventPromise);
await spawnPaymentDialogTask(frame, async (args) => {
let {address, tempAddressGuid, prefilledGuids: guids} = args;
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let state = await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.selectedShippingAddress == tempAddressGuid;
}, "Check the temp address is the selectedShippingAddress");
let addressGUIDs = Object.keys(state.tempAddresses);
is(addressGUIDs.length, 1, "Check there is one address");
@@ -650,17 +650,17 @@ add_task(async function test_countrySpec
await navigateToAddAddressPage(frame, addOptions);
await selectPaymentDialogShippingAddressByCountry(frame, "MO");
await spawnPaymentDialogTask(frame, async () => {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let editLink = content.document.querySelector("address-picker.shipping-related .edit-link");
is(editLink.textContent, "Edit", "Edit link text");
editLink.click();
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "shipping-address-page" && !!state["shipping-address-page"].guid;
diff --git browser/components/payments/test/browser/browser_address_edit_hidden_fields.js browser/components/payments/test/browser/browser_address_edit_hidden_fields.js
--- browser/components/payments/test/browser/browser_address_edit_hidden_fields.js
+++ browser/components/payments/test/browser/browser_address_edit_hidden_fields.js
@@ -64,17 +64,17 @@ add_task(async function test_hiddenField
await submitAddressForm(frame, null, options);
await shippingAddressChangePromise;
info("got shippingaddresschange event");
await spawnPaymentDialogTask(frame, async () => {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let {savedAddresses} = await PTU.DialogContentUtils.getCurrentState(content);
is(Object.keys(savedAddresses).length, 2, "2 saved addresses");
let savedAddress = Object.values(savedAddresses)
.find(address => address["given-name"] == "hiddenFields");
ok(savedAddress, "found the saved address");
is(savedAddress.country, "DE", "check country");
is(savedAddress["address-level2"], PTU.Addresses.TimBL["address-level2"],
@@ -108,17 +108,17 @@ add_task(async function test_hiddenField
let shippingAddressChangePromise = ContentTask.spawn(browser, {
eventName: "shippingaddresschange",
}, PTU.ContentTasks.awaitPaymentEventPromise);
await spawnPaymentDialogTask(frame, async (args) => {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let picker = content.document
.querySelector("address-picker[selected-state-key='selectedShippingAddress']");
Cu.waiveXrays(picker).dropdown.popupBox.focus();
EventUtils.synthesizeKey(PTU.Addresses.TimBL["given-name"], {}, content.window);
let editLink = content.document.querySelector("address-picker .edit-link");
is(editLink.textContent, "Edit", "Edit link text");
@@ -141,17 +141,17 @@ add_task(async function test_hiddenField
};
await submitAddressForm(frame, null, options);
await shippingAddressChangePromise;
info("got shippingaddresschange event");
await spawnPaymentDialogTask(frame, async () => {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let {savedAddresses} = await PTU.DialogContentUtils.getCurrentState(content);
is(Object.keys(savedAddresses).length, 1, "1 saved address");
let savedAddress = Object.values(savedAddresses)[0];
is(savedAddress.country, "DE", "check country");
is(savedAddress["address-level2"], PTU.Addresses.TimBL["address-level2"],
"check address-level2");
is(savedAddress["address-level1"], undefined, "address-level1 should not be saved");
diff --git browser/components/payments/test/browser/browser_card_edit.js browser/components/payments/test/browser/browser_card_edit.js
--- browser/components/payments/test/browser/browser_card_edit.js
+++ browser/components/payments/test/browser/browser_card_edit.js
@@ -35,17 +35,17 @@ async function add_link(aOptions = {}) {
await verifyPersistCheckbox(frame, {
checkboxSelector: "basic-card-form .persist-checkbox",
expectPersist: aOptions.expectDefaultCardPersist,
});
await spawnPaymentDialogTask(frame, async function checkState(testArgs = {}) {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let state = await PTU.DialogContentUtils.waitForState(content, (state) => {
return Object.keys(state.savedBasicCards).length == 1 &&
Object.keys(state.savedAddresses).length == 1;
}, "Check no cards or addresses present at beginning of test");
let title = content.document.querySelector("basic-card-form h2");
is(title.textContent, "Add Credit Card", "Add title should be set");
@@ -97,17 +97,17 @@ async function add_link(aOptions = {}) {
addressOptions.setPersistCheckedValue = aOptions.setAddressPersistCheckedValue;
}
await navigateToAddAddressPage(frame, addressOptions);
await spawnPaymentDialogTask(frame, async function checkTask(testArgs = {}) {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let title = content.document.querySelector("basic-card-form h2");
let card = Object.assign({}, PTU.BasicCards.JaneMasterCard);
let addressForm = content.document.querySelector("#billing-address-page");
ok(content.isVisible(addressForm), "Billing address page is visible");
let addressTitle = addressForm.querySelector("h2");
@@ -145,17 +145,17 @@ async function add_link(aOptions = {}) {
await verifyPersistCheckbox(frame, addressOptions);
await spawnPaymentDialogTask(frame, PTU.DialogContentTasks.clickPrimaryButton);
await spawnPaymentDialogTask(frame, async function checkCardPage(testArgs = {}) {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let state = await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "basic-card-page" && !state["basic-card-page"].guid;
}, "Check address was added and we're back on basic-card page (add)");
let addressCount = Object.keys(state.savedAddresses).length +
Object.keys(state.tempAddresses).length;
is(addressCount, 2, "Check address was added");
@@ -184,17 +184,17 @@ async function add_link(aOptions = {}) {
expectPersist: aOptions.expectCardPersist,
});
await verifyPersistCheckbox(frame, cardOptions);
await spawnPaymentDialogTask(frame, async function checkSaveButtonUpdatesOnCCNumberChange() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let button = content.document.querySelector(`basic-card-form button.primary`);
ok(!button.disabled, "Save button should not be disabled");
let field = content.document.getElementById("cc-number");
field.focus();
EventUtils.sendString("a", content.window);
button.focus();
@@ -225,31 +225,31 @@ async function add_link(aOptions = {}) {
info("waiting for paymentmethodchange event");
await ContentTask.spawn(browser, {
eventName: "paymentmethodchange",
}, PTU.ContentTasks.awaitPaymentEventPromise);
await spawnPaymentDialogTask(frame, async function waitForSummaryPage(testArgs = {}) {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "payment-summary";
}, "Check we are back on the summary page");
let picker = Cu.waiveXrays(content.document.querySelector("payment-method-picker"));
is(picker.securityCodeInput.querySelector("input").value, "123",
"Security code should be populated using the value set from the 'add' page");
});
await spawnPaymentDialogTask(frame, async function checkCardState(testArgs = {}) {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let {prefilledGuids} = testArgs;
let card = Object.assign({}, PTU.BasicCards.JaneMasterCard);
let state = await PTU.DialogContentUtils.getCurrentState(content);
let cardCount = Object.keys(state.savedBasicCards).length +
Object.keys(state.tempBasicCards).length;
is(cardCount, 2, "Card was added");
@@ -436,17 +436,17 @@ add_task(async function test_edit_link()
details: PTU.Details.total60USD,
prefilledGuids,
};
await spawnInDialogForMerchantTask(
PTU.ContentTasks.createAndShowRequest,
async function check({prefilledGuids}) {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let paymentMethodPicker = content.document.querySelector("payment-method-picker");
let editLink = paymentMethodPicker.querySelector(".edit-link");
content.fillField(Cu.waiveXrays(paymentMethodPicker).dropdown.popupBox,
prefilledGuids.card1GUID);
is(editLink.textContent, "Edit", "Edit link text");
@@ -638,17 +638,17 @@ add_task(async function test_invalid_net
details: PTU.Details.total60USD,
prefilledGuids,
};
await spawnInDialogForMerchantTask(
PTU.ContentTasks.createAndShowRequest,
async function check({prefilledGuids}) {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let paymentMethodPicker = content.document.querySelector("payment-method-picker");
let editLink = paymentMethodPicker.querySelector(".edit-link");
content.fillField(Cu.waiveXrays(paymentMethodPicker).dropdown.popupBox,
prefilledGuids.card1GUID);
is(editLink.textContent, "Edit", "Edit link text");
@@ -710,17 +710,17 @@ add_task(async function test_private_car
methodData: [PTU.MethodData.basicCard],
details: PTU.Details.total60USD,
merchantTaskFn: PTU.ContentTasks.createAndShowRequest,
});
await spawnPaymentDialogTask(frame, async function check() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let addLink = content.document.querySelector("payment-method-picker .add-link");
is(addLink.textContent, "Add", "Add link text");
addLink.click();
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "basic-card-page" && !state["basic-card-page"].guid;
@@ -731,17 +731,17 @@ add_task(async function test_private_car
await fillInCardForm(frame, {
["cc-csc"]: "999",
...PTU.BasicCards.JohnDoe,
});
await spawnPaymentDialogTask(frame, async function() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let card = Object.assign({}, PTU.BasicCards.JohnDoe);
let state = await PTU.DialogContentUtils.getCurrentState(content);
let savedCardCount = Object.keys(state.savedBasicCards).length;
let tempCardCount = Object.keys(state.tempBasicCards).length;
content.document.querySelector("basic-card-form button.save-button").click();
state = await PTU.DialogContentUtils.waitForState(content, (state) => {
diff --git browser/components/payments/test/browser/browser_change_shipping.js browser/components/payments/test/browser/browser_change_shipping.js
--- browser/components/payments/test/browser/browser_change_shipping.js
+++ browser/components/payments/test/browser/browser_change_shipping.js
@@ -76,17 +76,17 @@ add_task(async function test_change_ship
"Shipping options should be in EUR after the shippingaddresschange");
is(shippingOptions.selectedOptionID, "1", "id:1 should still be selected");
is(shippingOptions.selectedOptionValue, "1.01",
"amount should be '1.01' after the shippingaddresschange");
await spawnPaymentDialogTask(frame, async function() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
// verify update of total
// Note: The update includes a modifier, and modifiers must include a total
// so the expected total is that one
is(content.document.querySelector("#total > currency-amount").textContent,
"\u20AC2.50 EUR",
"Check updated total currency amount");
let btn = content.document.querySelector("#view-all");
diff --git browser/components/payments/test/browser/browser_dropdowns.js browser/components/payments/test/browser/browser_dropdowns.js
--- browser/components/payments/test/browser/browser_dropdowns.js
+++ browser/components/payments/test/browser/browser_dropdowns.js
@@ -16,17 +16,17 @@ add_task(async function test_dropdown()
let popupset = frame.ownerDocument.querySelector("popupset");
ok(popupset, "popupset exists");
let popupshownPromise = BrowserTestUtils.waitForEvent(popupset, "popupshown");
info("switch to the address add page");
await spawnPaymentDialogTask(frame, async function changeToAddressAddPage() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let addLink = content.document.querySelector("address-picker.shipping-related .add-link");
is(addLink.textContent, "Add", "Add link text");
addLink.click();
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "shipping-address-page" && !state.page.guid;
diff --git browser/components/payments/test/browser/browser_onboarding_wizard.js browser/components/payments/test/browser/browser_onboarding_wizard.js
--- browser/components/payments/test/browser/browser_onboarding_wizard.js
+++ browser/components/payments/test/browser/browser_onboarding_wizard.js
@@ -28,17 +28,17 @@ add_task(async function test_onboarding_
details: PTU.Details.total60USD,
options: PTU.Options.requestShippingOption,
merchantTaskFn: PTU.ContentTasks.createAndShowRequest,
});
await spawnPaymentDialogTask(frame, async function() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "shipping-address-page";
}, "Address page is shown first during on-boarding if there are no saved addresses");
let addressForm = content.document.querySelector("#shipping-address-page");
info("Checking if the address page has been rendered");
let addressSaveButton = addressForm.querySelector(".save-button");
@@ -70,17 +70,17 @@ add_task(async function test_onboarding_
};
await fillInShippingAddressForm(frame, PTU.Addresses.TimBL2, addOptions);
await spawnPaymentDialogTask(frame, PTU.DialogContentTasks.clickPrimaryButton);
await spawnPaymentDialogTask(frame, async function() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "basic-card-page";
}, "Basic card page is shown after the address page during on boarding");
let cardSaveButton = content.document.querySelector("basic-card-form .save-button");
is(cardSaveButton.textContent, "Next",
"Card save button has the correct label during onboarding");
@@ -102,17 +102,17 @@ add_task(async function test_onboarding_
...PTU.BasicCards.JohnDoe,
});
await spawnPaymentDialogTask(frame, PTU.DialogContentTasks.clickPrimaryButton);
await spawnPaymentDialogTask(frame, async function() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "payment-summary";
}, "Payment summary page is shown after the basic card page during on boarding");
let cancelButton = content.document.querySelector("#cancel");
ok(content.isVisible(cancelButton), "Payment summary page is rendered");
});
@@ -138,17 +138,17 @@ add_task(async function test_onboarding_
details: PTU.Details.total60USD,
options: PTU.Options.requestShippingOption,
merchantTaskFn: PTU.ContentTasks.createAndShowRequest,
});
await spawnPaymentDialogTask(frame, async function() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "payment-summary";
}, "Payment summary page is shown first when there are saved addresses and saved cards");
info("Checking if the payment summary page is now visible");
let cancelButton = content.document.querySelector("#cancel");
ok(content.isVisible(cancelButton), "Payment summary page is rendered");
@@ -213,17 +213,17 @@ add_task(async function test_onboarding_
details: PTU.Details.total60USD,
options: PTU.Options.requestShippingOption,
merchantTaskFn: PTU.ContentTasks.createAndShowRequest,
});
await spawnPaymentDialogTask(frame, async function() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "basic-card-page";
}, "Basic card page is shown first if there are saved addresses during on boarding");
info("Checking if the basic card page has been rendered");
let cardSaveButton = content.document.querySelector("basic-card-form .save-button");
ok(content.isVisible(cardSaveButton), "Basic card page is rendered");
@@ -277,17 +277,17 @@ add_task(async function test_onboarding_
initialPageId: "payment-summary",
addressPageId: "shipping-address-page",
expectPersist: true,
};
await spawnPaymentDialogTask(frame, async function() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "shipping-address-page";
}, "Shipping address page is shown first if there are saved addresses during on boarding");
info("Checking if the address page has been rendered");
let addressForm = content.document.querySelector("#shipping-address-page");
let addressSaveButton = addressForm.querySelector(".save-button");
@@ -295,17 +295,17 @@ add_task(async function test_onboarding_
});
await fillInShippingAddressForm(frame, PTU.Addresses.TimBL2, addOptions);
await spawnPaymentDialogTask(frame, PTU.DialogContentTasks.clickPrimaryButton);
await spawnPaymentDialogTask(frame, async function checkSavedAndCancelButton() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "payment-summary";
}, "payment-summary is now visible");
let cancelButton = content.document.querySelector("#cancel");
ok(content.isVisible(cancelButton), "Payment summary page is shown next");
});
@@ -330,17 +330,17 @@ add_task(async function test_onboarding_
methodData: [PTU.MethodData.basicCard],
details: PTU.Details.total60USD,
merchantTaskFn: PTU.ContentTasks.createAndShowRequest,
});
await spawnPaymentDialogTask(frame, async function() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "billing-address-page";
// eslint-disable-next-line max-len
}, "Billing address page is shown first during on-boarding if requestShipping is turned off");
info("Checking if the billing address page has been rendered");
let addressForm = content.document.querySelector("#billing-address-page");
@@ -361,17 +361,17 @@ add_task(async function test_onboarding_
};
await fillInBillingAddressForm(frame, PTU.Addresses.TimBL2, addOptions);
await spawnPaymentDialogTask(frame, PTU.DialogContentTasks.clickPrimaryButton);
await spawnPaymentDialogTask(frame, async function() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "basic-card-page";
// eslint-disable-next-line max-len
}, "Basic card page is shown after the billing address page during onboarding if requestShipping is turned off");
let cardSaveButton = content.document.querySelector("basic-card-form .save-button");
ok(content.isVisible(cardSaveButton), "Basic card page is rendered");
@@ -388,17 +388,17 @@ add_task(async function test_onboarding_
...PTU.BasicCards.JohnDoe,
});
await spawnPaymentDialogTask(frame, PTU.DialogContentTasks.clickPrimaryButton);
await spawnPaymentDialogTask(frame, async function() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "payment-summary";
}, "payment-summary is shown after the basic card page during on boarding");
let cancelButton = content.document.querySelector("#cancel");
ok(content.isVisible(cancelButton), "Payment summary page is rendered");
});
@@ -455,17 +455,17 @@ add_task(async function test_back_button
methodData: [PTU.MethodData.basicCard],
details: PTU.Details.total60USD,
merchantTaskFn: PTU.ContentTasks.createAndShowRequest,
});
await spawnPaymentDialogTask(frame, async function() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "billing-address-page";
}, "Billing address page is shown first if there are no saved addresses " +
"and requestShipping is false during on boarding");
info("Checking if the address page has been rendered");
let addressSaveButton = content.document.querySelector("#billing-address-page .save-button");
ok(content.isVisible(addressSaveButton), "Address save button is rendered");
@@ -480,17 +480,17 @@ add_task(async function test_back_button
};
await fillInBillingAddressForm(frame, PTU.Addresses.TimBL2, addOptions);
await spawnPaymentDialogTask(frame, PTU.DialogContentTasks.clickPrimaryButton);
await spawnPaymentDialogTask(frame, async function() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "basic-card-page";
}, "Basic card page is shown next");
info("Checking if basic card page is rendered");
let basicCardBackButton = content.document.querySelector("basic-card-form .back-button");
ok(content.isVisible(basicCardBackButton), "Back button is visible on the basic card page");
diff --git browser/components/payments/test/browser/browser_payerRequestedFields.js browser/components/payments/test/browser/browser_payerRequestedFields.js
--- browser/components/payments/test/browser/browser_payerRequestedFields.js
+++ browser/components/payments/test/browser/browser_payerRequestedFields.js
@@ -43,17 +43,17 @@ add_task(async function test_add_link()
initialPageId: "payment-summary",
addressPageId: "payer-address-page",
expectPersist: true,
});
await spawnPaymentDialogTask(frame, async () => {
let {
PaymentTestUtils,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let addressForm = content.document.querySelector("#payer-address-page");
let title = addressForm.querySelector("h2");
is(title.textContent, "Add Payer Contact", "Page title should be set");
let saveButton = addressForm.querySelector(".save-button");
is(saveButton.textContent, "Next", "Save button has the correct label");
@@ -78,17 +78,17 @@ add_task(async function test_add_link()
addressPageId: "shipping-address-page",
initialPageId: "payment-summary",
expectPersist: true,
});
await spawnPaymentDialogTask(frame, async () => {
let {
PaymentTestUtils,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let addressForm = content.document.querySelector("#shipping-address-page");
let title = addressForm.querySelector("address-form h2");
is(title.textContent, "Add Shipping Address", "Page title should be set");
let saveButton = addressForm.querySelector(".save-button");
is(saveButton.textContent, "Next", "Save button has the correct label");
diff --git browser/components/payments/test/browser/browser_profile_storage.js browser/components/payments/test/browser/browser_profile_storage.js
--- browser/components/payments/test/browser/browser_profile_storage.js
+++ browser/components/payments/test/browser/browser_profile_storage.js
@@ -63,17 +63,17 @@ add_task(async function test_initial_sta
address1GUID,
address2GUID,
card1GUID,
}) {
info("checkAdd");
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let {
savedAddresses,
savedBasicCards,
} = await PTU.DialogContentUtils.waitForState(
content,
state => !!state.savedAddresses[address2GUID]
);
@@ -107,17 +107,17 @@ add_task(async function test_initial_sta
address1GUID,
address2GUID,
card1GUID,
}) {
info("checkUpdate");
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let {
savedAddresses,
savedBasicCards,
} = await PTU.DialogContentUtils.waitForState(
content,
state => !!state.savedAddresses[address2GUID]
);
@@ -149,17 +149,17 @@ add_task(async function test_initial_sta
await spawnPaymentDialogTask(frame, async function checkRemove({
address2GUID,
card1GUID,
}) {
info("checkRemove");
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let {
savedAddresses,
savedBasicCards,
} = await PTU.DialogContentUtils.waitForState(
content,
state => !!state.savedAddresses[address2GUID]
);
diff --git browser/components/payments/test/browser/browser_retry.js browser/components/payments/test/browser/browser_retry.js
--- browser/components/payments/test/browser/browser_retry.js
+++ browser/components/payments/test/browser/browser_retry.js
@@ -41,17 +41,17 @@ add_task(async function test_retry_with_
});
info("clicking the button to try pay the 1st time");
await loginAndCompletePayment(frame);
let retryUpdatePromise = spawnPaymentDialogTask(frame, async function checkDialog() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let state = await PTU.DialogContentUtils.waitForState(content, ({request}) => {
return request.completeStatus === "processing";
}, "Wait for completeStatus from pay button click");
is(state.request.completeStatus, "processing", "Check completeStatus is processing");
is(state.request.paymentDetails.error, "", "Check error string is empty");
ok(state.changesPrevented, "Changes prevented");
diff --git browser/components/payments/test/browser/browser_retry_fieldErrors.js browser/components/payments/test/browser/browser_retry_fieldErrors.js
--- browser/components/payments/test/browser/browser_retry_fieldErrors.js
+++ browser/components/payments/test/browser/browser_retry_fieldErrors.js
@@ -54,17 +54,17 @@ add_task(async function test_retry_with_
});
info("clicking the button to try pay the 1st time");
await loginAndCompletePayment(frame);
let retryUpdatePromise = spawnPaymentDialogTask(frame, async function checkDialog() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let state = await PTU.DialogContentUtils.waitForState(content, ({request}) => {
return request.completeStatus === "processing";
}, "Wait for completeStatus from pay button click");
is(state.request.completeStatus, "processing", "Check completeStatus is processing");
is(state.request.paymentDetails.shippingAddressErrors.country, undefined,
"Check country error string is empty");
@@ -118,17 +118,17 @@ add_task(async function test_retry_with_
PTU.ContentTasks.addRetryHandler);
await loginAndCompletePayment(frame);
await spawnPaymentDialogTask(frame, async function checkRegionError() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let state = await PTU.DialogContentUtils.waitForState(content, ({request}) => {
return request.completeStatus === "";
}, "Wait for completeStatus from DOM update");
is(state.request.completeStatus, "", "Check completeStatus");
is(state.request.paymentDetails.shippingAddressErrors.regionCode,
"Can only ship to California",
@@ -206,17 +206,17 @@ add_task(async function test_retry_with_
});
info("clicking the button to try pay the 1st time");
await loginAndCompletePayment(frame);
let retryUpdatePromise = spawnPaymentDialogTask(frame, async function checkDialog() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let state = await PTU.DialogContentUtils.waitForState(content, ({request}) => {
return request.completeStatus === "processing";
}, "Wait for completeStatus from pay button click");
is(state.request.completeStatus, "processing", "Check completeStatus is processing");
is(state.request.paymentDetails.payerErrors.email, undefined,
@@ -273,17 +273,17 @@ add_task(async function test_retry_with_
PTU.ContentTasks.addRetryHandler);
await loginAndCompletePayment(frame);
await spawnPaymentDialogTask(frame, async function checkRegionError() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let state = await PTU.DialogContentUtils.waitForState(content, ({request}) => {
return request.completeStatus === "";
}, "Wait for completeStatus from DOM update");
is(state.request.completeStatus, "", "Check completeStatus");
is(state.request.paymentDetails.payerErrors.phone,
"Your phone number isn't valid",
@@ -380,17 +380,17 @@ add_task(async function test_retry_with_
});
info("clicking the button to try pay the 1st time");
await loginAndCompletePayment(frame);
let retryUpdatePromise = spawnPaymentDialogTask(frame, async function checkDialog() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let state = await PTU.DialogContentUtils.waitForState(content, ({request}) => {
return request.completeStatus === "processing";
}, "Wait for completeStatus from pay button click");
is(state.request.completeStatus, "processing", "Check completeStatus is processing");
is(state.request.paymentDetails.paymentMethodErrors, null,
@@ -450,17 +450,17 @@ add_task(async function test_retry_with_
PTU.ContentTasks.addRetryHandler);
await loginAndCompletePayment(frame);
await spawnPaymentDialogTask(frame, async function checkPostalCodeError() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let state = await PTU.DialogContentUtils.waitForState(content, ({request}) => {
return request.completeStatus === "";
}, "Wait for completeStatus from DOM update");
is(state.request.completeStatus, "", "Check completeStatus");
is(state.request.paymentDetails.paymentMethodErrors.billingAddress.postalCode,
"Your postal code isn't valid",
@@ -497,30 +497,30 @@ add_task(async function test_retry_with_
await submitAddressForm(frame, null, {
isEditing: true,
nextPageId: "basic-card-page",
});
await spawnPaymentDialogTask(frame, async function checkErrorsCleared() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.request.paymentDetails.paymentMethodErrors == null;
},
"Check no paymentMethod errors are present");
});
await spawnPaymentDialogTask(frame, PTU.DialogContentTasks.clickPrimaryButton);
await spawnPaymentDialogTask(frame, async function checkErrorsCleared() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.request.paymentDetails.paymentMethodErrors == null;
},
"Check no card errors are present after save");
});
// TODO: Add an `await` here after bug 1477113.
diff --git browser/components/payments/test/browser/browser_shippingaddresschange_error.js browser/components/payments/test/browser/browser_shippingaddresschange_error.js
--- browser/components/payments/test/browser/browser_shippingaddresschange_error.js
+++ browser/components/payments/test/browser/browser_shippingaddresschange_error.js
@@ -101,17 +101,17 @@ add_task(async function test_show_field_
info("awaiting the shippingaddresschange event");
await ContentTask.spawn(browser, {
eventName: "shippingaddresschange",
}, PTU.ContentTasks.awaitPaymentEventPromise);
await spawnPaymentDialogTask(frame, async () => {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return Object.keys(state.request.paymentDetails.shippingAddressErrors).length;
}, "Check that there are shippingAddressErrors");
is(content.document.querySelector("header .page-error").textContent,
PTU.Details.fieldSpecificErrors.error,
"Error text should be present on dialog");
@@ -173,17 +173,17 @@ add_task(async function test_show_field_
PTU.Details.total2USD),
}, PTU.ContentTasks.updateWith);
await spawnPaymentDialogTask(frame, PTU.DialogContentTasks.clickPrimaryButton);
await spawnPaymentDialogTask(frame, async function checkForNewErrors() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "payment-summary" &&
state.request.paymentDetails.shippingAddressErrors.phone == "Invalid phone number";
}, "Check the new error is in state");
ok(content.document.querySelector("#payment-summary").innerText
.includes("Invalid phone number"),
@@ -214,17 +214,17 @@ add_task(async function test_show_field_
PTU.Details.total2USD),
}, PTU.ContentTasks.updateWith);
await spawnPaymentDialogTask(frame, PTU.DialogContentTasks.clickPrimaryButton);
await spawnPaymentDialogTask(frame, async function fixLastError() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "payment-summary";
}, "Check we're back on summary view");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return !Object.keys(state.request.paymentDetails.shippingAddressErrors).length;
}, "Check that there are no more shippingAddressErrors");
diff --git browser/components/payments/test/browser/browser_tab_modal.js browser/components/payments/test/browser/browser_tab_modal.js
--- browser/components/payments/test/browser/browser_tab_modal.js
+++ browser/components/payments/test/browser/browser_tab_modal.js
@@ -114,17 +114,17 @@ add_task(async function test_detachToNew
setPersistCheckedValue: false,
});
await spawnPaymentDialogTask(frame, PTU.DialogContentTasks.clickPrimaryButton);
await spawnPaymentDialogTask(frame, async function waitForPageChange() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, (state) => {
return state.page.id == "basic-card-page";
}, "Wait for basic-card-page");
});
await fillInCardForm(frame, card1, {
checkboxSelector: "basic-card-form .persist-checkbox",
@@ -150,17 +150,17 @@ add_task(async function test_detachToNew
ok(newBrowser, "Found new <browser>");
let widget = await TestUtils.waitForCondition(async () => getPaymentWidget(requestId));
await checkTabModal(newBrowser, widget, "after detach");
let state = await spawnPaymentDialogTask(widget.frameElement, async function checkAfterDetach() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
return PTU.DialogContentUtils.getCurrentState(content);
});
is(Object.values(state.tempAddresses).length, 1, "Check still 1 temp. address in state");
is(Object.values(state.tempBasicCards).length, 1, "Check still 1 temp. basic card in state");
temporaryStore = widget.frameElement.paymentDialogWrapper.temporaryStore;
@@ -168,17 +168,17 @@ add_task(async function test_detachToNew
is(Object.values(temporaryStore.creditCards.getAll()).length, 1, "Check card store in wrapper");
info("Check that the message manager and formautofill-storage-changed observer are connected");
is(Object.values(state.savedAddresses).length, 0, "Check 0 saved addresses");
await addAddressRecord(PTU.Addresses.TimBL2);
await spawnPaymentDialogTask(widget.frameElement, async function waitForSavedAddress() {
let {
PaymentTestUtils: PTU,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
await PTU.DialogContentUtils.waitForState(content, function checkSavedAddresses(s) {
return Object.values(s.savedAddresses).length == 1;
}, "Check 1 saved address in state");
});
info("re-attach the tab back in the original window to test the event listeners were added");
diff --git browser/components/payments/test/browser/head.js browser/components/payments/test/browser/head.js
--- browser/components/payments/test/browser/head.js
+++ browser/components/payments/test/browser/head.js
@@ -13,25 +13,22 @@ const BLANK_PAGE_URL = "https://example.
const RESPONSE_TIMEOUT_PREF = "dom.payments.response.timeout";
const SAVE_CREDITCARD_DEFAULT_PREF = "dom.payments.defaults.saveCreditCard";
const SAVE_ADDRESS_DEFAULT_PREF = "dom.payments.defaults.saveAddress";
const paymentSrv = Cc["@mozilla.org/dom/payments/payment-request-service;1"]
.getService(Ci.nsIPaymentRequestService);
const paymentUISrv = Cc["@mozilla.org/dom/payments/payment-ui-service;1"]
.getService(Ci.nsIPaymentUIService).wrappedJSObject;
-const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm", {});
-const {formAutofillStorage} = ChromeUtils.import(
- "resource://formautofill/FormAutofillStorage.jsm", {});
-const {OSKeyStoreTestUtils} = ChromeUtils.import(
- "resource://testing-common/OSKeyStoreTestUtils.jsm", {});
-const {PaymentTestUtils: PTU} = ChromeUtils.import(
- "resource://testing-common/PaymentTestUtils.jsm", {});
-ChromeUtils.import("resource:///modules/BrowserWindowTracker.jsm");
-ChromeUtils.import("resource://gre/modules/CreditCard.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {formAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm");
+const {OSKeyStoreTestUtils} = ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm");
+const {PaymentTestUtils: PTU} = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
+var {BrowserWindowTracker} = ChromeUtils.import("resource:///modules/BrowserWindowTracker.jsm");
+var {CreditCard} = ChromeUtils.import("resource://gre/modules/CreditCard.jsm");
function getPaymentRequests() {
return Array.from(paymentSrv.enumerate());
}
/**
* Return the container (e.g. dialog or overlay) that the payment request contents are shown in.
* This abstracts away the details of the widget used so that this can more easily transition to
@@ -404,17 +401,17 @@ async function selectPaymentDialogShippi
async function navigateToAddAddressPage(frame, aOptions = {}) {
ok(aOptions.initialPageId, "initialPageId option supplied");
ok(aOptions.addressPageId, "addressPageId option supplied");
ok(aOptions.addLinkSelector, "addLinkSelector option supplied");
await spawnPaymentDialogTask(frame, async (options) => {
let {
PaymentTestUtils,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
info("navigateToAddAddressPage: check we're on the expected page first");
await PaymentTestUtils.DialogContentUtils.waitForState(content, (state) => {
info("current page state: " + state.page.id + " waiting for: " + options.initialPageId);
return state.page.id == options.initialPageId;
}, "Check initial page state");
// click through to add/edit address page
@@ -568,17 +565,17 @@ async function verifyCardNetwork(frame,
async function submitAddressForm(frame, aAddress, aOptions = {
nextPageId: "payment-summary",
}) {
await spawnPaymentDialogTask(frame, async (args) => {
let {options = {}} = args;
let nextPageId = options.nextPageId || "payment-summary";
let {
PaymentTestUtils,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
let oldState = await PaymentTestUtils.DialogContentUtils.getCurrentState(content);
let pageId = oldState.page.id;
// submit the form to return to summary page
content.document.querySelector(`#${pageId} button.primary`).click();
let currState = await PaymentTestUtils.DialogContentUtils.waitForState(content, (state) => {
@@ -620,17 +617,17 @@ async function manuallyAddShippingAddres
}
async function navigateToAddCardPage(frame, aOptions = {
addLinkSelector: "payment-method-picker .add-link",
}) {
await spawnPaymentDialogTask(frame, async (options) => {
let {
PaymentTestUtils,
- } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm", {});
+ } = ChromeUtils.import("resource://testing-common/PaymentTestUtils.jsm");
// check were on the summary page first
await PaymentTestUtils.DialogContentUtils.waitForState(content, (state) => {
return !state.page.id || (state.page.id == "payment-summary");
}, "Check summary page state");
// click through to add/edit card page
let addLink = content.document.querySelector(options.addLinkSelector);
diff --git browser/components/payments/test/unit/head.js browser/components/payments/test/unit/head.js
--- browser/components/payments/test/unit/head.js
+++ browser/components/payments/test/unit/head.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
// ================================================
// Load mocking/stubbing library, sinon
// docs: http://sinonjs.org/releases/v2.3.2/
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
+var {clearInterval, clearTimeout, setInterval, setIntervalWithTarget, setTimeout, setTimeoutWithTarget} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js", this);
/* globals sinon */
// ================================================
diff --git browser/components/places/PlacesUIUtils.jsm browser/components/places/PlacesUIUtils.jsm
--- browser/components/places/PlacesUIUtils.jsm
+++ browser/components/places/PlacesUIUtils.jsm
@@ -1,18 +1,18 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var EXPORTED_SYMBOLS = ["PlacesUIUtils"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {clearTimeout, setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["Element"]);
XPCOMUtils.defineLazyModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.jsm",
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
OpenInTabsUtils: "resource:///modules/OpenInTabsUtils.jsm",
PlacesTransactions: "resource://gre/modules/PlacesTransactions.jsm",
diff --git browser/components/places/content/bookmarkProperties.js browser/components/places/content/bookmarkProperties.js
--- browser/components/places/content/bookmarkProperties.js
+++ browser/components/places/content/bookmarkProperties.js
@@ -49,18 +49,18 @@
* window.arguments[0].bookmarkGuid is set to the guid of the item, if the
* dialog is accepted.
*/
/* import-globals-from editBookmark.js */
/* import-globals-from controller.js */
/* Shared Places Import - change other consumers if you change this: */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
PlacesUIUtils: "resource:///modules/PlacesUIUtils.jsm",
PlacesTransactions: "resource://gre/modules/PlacesTransactions.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
});
XPCOMUtils.defineLazyScriptGetter(this, "PlacesTreeView",
"chrome://browser/content/places/treeView.js");
diff --git browser/components/places/content/bookmarksSidebar.js browser/components/places/content/bookmarksSidebar.js
--- browser/components/places/content/bookmarksSidebar.js
+++ browser/components/places/content/bookmarksSidebar.js
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* Shared Places Import - change other consumers if you change this: */
ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
LightweightThemeChild: "resource:///actors/LightweightThemeChild.jsm",
PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
PlacesUIUtils: "resource:///modules/PlacesUIUtils.jsm",
PlacesTransactions: "resource://gre/modules/PlacesTransactions.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
});
XPCOMUtils.defineLazyScriptGetter(this, "PlacesTreeView",
diff --git browser/components/places/content/controller.js browser/components/places/content/controller.js
--- browser/components/places/content/controller.js
+++ browser/components/places/content/controller.js
@@ -220,17 +220,17 @@ PlacesController.prototype = {
break;
case "placesCmd_deleteDataHost":
let host;
if (PlacesUtils.nodeIsHost(this._view.selectedNode)) {
host = this._view.selectedNode.query.domain;
} else {
host = Services.io.newURI(this._view.selectedNode.uri).host;
}
- let {ForgetAboutSite} = ChromeUtils.import("resource://gre/modules/ForgetAboutSite.jsm", {});
+ let {ForgetAboutSite} = ChromeUtils.import("resource://gre/modules/ForgetAboutSite.jsm");
ForgetAboutSite.removeDataFromDomain(host)
.catch(Cu.reportError);
break;
case "cmd_selectAll":
this.selectAll();
break;
case "placesCmd_open":
PlacesUIUtils.openNodeIn(this._view.selectedNode, "current", this._view);
diff --git browser/components/places/content/editBookmark.js browser/components/places/content/editBookmark.js
--- browser/components/places/content/editBookmark.js
+++ browser/components/places/content/editBookmark.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
const MAX_FOLDER_ITEM_IN_MENU_LIST = 5;
var gEditItemOverlay = {
// Array of PlacesTransactions accumulated by internal changes. It can be used
// to wait for completion.
transactionPromises: null,
_observersAdded: false,
diff --git browser/components/places/content/historySidebar.js browser/components/places/content/historySidebar.js
--- browser/components/places/content/historySidebar.js
+++ browser/components/places/content/historySidebar.js
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* Shared Places Import - change other consumers if you change this: */
ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
LightweightThemeChild: "resource:///actors/LightweightThemeChild.jsm",
PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
PlacesUIUtils: "resource:///modules/PlacesUIUtils.jsm",
PlacesTransactions: "resource://gre/modules/PlacesTransactions.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
});
XPCOMUtils.defineLazyScriptGetter(this, "PlacesTreeView",
diff --git browser/components/places/content/places.js browser/components/places/content/places.js
--- browser/components/places/content/places.js
+++ browser/components/places/content/places.js
@@ -3,32 +3,32 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* import-globals-from editBookmark.js */
/* import-globals-from ../../../../toolkit/content/contentAreaUtils.js */
/* import-globals-from ../../downloads/content/allDownloadsView.js */
/* Shared Places Import - change other consumers if you change this: */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
PlacesUIUtils: "resource:///modules/PlacesUIUtils.jsm",
PlacesTransactions: "resource://gre/modules/PlacesTransactions.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
});
XPCOMUtils.defineLazyScriptGetter(this, "PlacesTreeView",
"chrome://browser/content/places/treeView.js");
XPCOMUtils.defineLazyScriptGetter(this, ["PlacesInsertionPoint", "PlacesController",
"PlacesControllerDragHelper"],
"chrome://browser/content/places/controller.js");
/* End Shared Places Import */
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
ChromeUtils.defineModuleGetter(this, "MigrationUtils",
"resource:///modules/MigrationUtils.jsm");
ChromeUtils.defineModuleGetter(this, "BookmarkJSONUtils",
"resource://gre/modules/BookmarkJSONUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesBackups",
"resource://gre/modules/PlacesBackups.jsm");
ChromeUtils.defineModuleGetter(this, "DownloadUtils",
"resource://gre/modules/DownloadUtils.jsm");
@@ -401,17 +401,17 @@ var PlacesOrganizer = {
/**
* Open a file-picker and import the selected file into the bookmarks store
*/
importFromFile: function PO_importFromFile() {
let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
let fpCallback = function fpCallback_done(aResult) {
if (aResult != Ci.nsIFilePicker.returnCancel && fp.fileURL) {
- ChromeUtils.import("resource://gre/modules/BookmarkHTMLUtils.jsm");
+ var {BookmarkHTMLUtils} = ChromeUtils.import("resource://gre/modules/BookmarkHTMLUtils.jsm");
BookmarkHTMLUtils.importFromURL(fp.fileURL.spec)
.catch(Cu.reportError);
}
};
fp.init(window, PlacesUIUtils.getString("SelectImport"),
Ci.nsIFilePicker.modeOpen);
fp.appendFilters(Ci.nsIFilePicker.filterHTML);
@@ -420,17 +420,17 @@ var PlacesOrganizer = {
/**
* Allows simple exporting of bookmarks.
*/
exportBookmarks: function PO_exportBookmarks() {
let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
let fpCallback = function fpCallback_done(aResult) {
if (aResult != Ci.nsIFilePicker.returnCancel) {
- ChromeUtils.import("resource://gre/modules/BookmarkHTMLUtils.jsm");
+ var {BookmarkHTMLUtils} = ChromeUtils.import("resource://gre/modules/BookmarkHTMLUtils.jsm");
BookmarkHTMLUtils.exportToFile(fp.file.path)
.catch(Cu.reportError);
}
};
fp.init(window, PlacesUIUtils.getString("EnterExport"),
Ci.nsIFilePicker.modeSave);
fp.appendFilters(Ci.nsIFilePicker.filterHTML);
diff --git browser/components/places/content/treeView.js browser/components/places/content/treeView.js
--- browser/components/places/content/treeView.js
+++ browser/components/places/content/treeView.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* import-globals-from controller.js */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
/**
* This returns the key for any node/details object.
*
* @param nodeOrDetails
* A node, or an object containing the following properties:
* - uri
* - time
diff --git browser/components/places/tests/browser/browser_bookmarksProperties.js browser/components/places/tests/browser/browser_bookmarksProperties.js
--- browser/components/places/tests/browser/browser_bookmarksProperties.js
+++ browser/components/places/tests/browser/browser_bookmarksProperties.js
@@ -29,17 +29,17 @@ const ACTION_ADD = 1;
const TYPE_FOLDER = 0;
const TYPE_BOOKMARK = 1;
const TEST_URL = "http://www.example.com/";
const DIALOG_URL = "chrome://browser/content/places/bookmarkProperties.xul";
const DIALOG_URL_MINIMAL_UI = "chrome://browser/content/places/bookmarkProperties2.xul";
-ChromeUtils.import("resource:///modules/BrowserWindowTracker.jsm");
+const {BrowserWindowTracker} = ChromeUtils.import("resource:///modules/BrowserWindowTracker.jsm");
var win = BrowserWindowTracker.getTopWindow();
function add_bookmark(url) {
return PlacesUtils.bookmarks.insert({
parentGuid: PlacesUtils.bookmarks.unfiledGuid,
url,
title: `bookmark/${url}`,
});
diff --git browser/components/places/tests/chrome/head.js browser/components/places/tests/chrome/head.js
--- browser/components/places/tests/chrome/head.js
+++ browser/components/places/tests/chrome/head.js
@@ -1,25 +1,25 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Services.scriptloader.loadSubScript("chrome://global/content/globalOverlay.js", this);
Services.scriptloader.loadSubScript("chrome://browser/content/utilityOverlay.js", this);
ChromeUtils.defineModuleGetter(this, "PlacesTestUtils",
"resource://testing-common/PlacesTestUtils.jsm");
ChromeUtils.defineModuleGetter(this, "BrowserTestUtils",
"resource://testing-common/BrowserTestUtils.jsm");
ChromeUtils.defineModuleGetter(window,
"PlacesUtils", "resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(window,
"PlacesUIUtils", "resource:///modules/PlacesUIUtils.jsm");
ChromeUtils.defineModuleGetter(window,
"PlacesTransactions", "resource://gre/modules/PlacesTransactions.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyScriptGetter(window, ["PlacesTreeView"],
"chrome://browser/content/places/treeView.js");
XPCOMUtils.defineLazyScriptGetter(window,
["PlacesInsertionPoint", "PlacesController", "PlacesControllerDragHelper"],
"chrome://browser/content/places/controller.js");
diff --git browser/components/places/tests/unit/head_bookmarks.js browser/components/places/tests/unit/head_bookmarks.js
--- browser/components/places/tests/unit/head_bookmarks.js
+++ browser/components/places/tests/unit/head_bookmarks.js
@@ -1,14 +1,14 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Import common head.
/* import-globals-from ../../../../../toolkit/components/places/tests/head_common.js */
var commonFile = do_get_file("../../../../../toolkit/components/places/tests/head_common.js", false);
if (commonFile) {
let uri = Services.io.newFileURI(commonFile);
Services.scriptloader.loadSubScript(uri.spec, this);
}
diff --git browser/components/places/tests/unit/test_PUIU_setCharsetForPage.js browser/components/places/tests/unit/test_PUIU_setCharsetForPage.js
--- browser/components/places/tests/unit/test_PUIU_setCharsetForPage.js
+++ browser/components/places/tests/unit/test_PUIU_setCharsetForPage.js
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim:set ts=2 sw=2 sts=2 et: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const {PrivateBrowsingUtils} =
- ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm", {});
+ ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
const UTF8 = "UTF-8";
const UTF16 = "UTF-16";
const CHARSET_ANNO = PlacesUtils.CHARSET_ANNO;
const TEST_URI = "http://foo.com";
const TEST_BOOKMARKED_URI = "http://bar.com";
diff --git browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup_default.js browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup_default.js
--- browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup_default.js
+++ browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup_default.js
@@ -4,17 +4,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/**
* Tests that nsBrowserGlue correctly restores default bookmarks if database is
* corrupt, nor a JSON backup nor bookmarks.html are available.
*/
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
function run_test() {
// Remove bookmarks.html from profile.
remove_bookmarks_html();
// Remove JSON backup from profile.
remove_all_JSON_backups();
diff --git browser/components/places/tests/unit/test_clearHistory_shutdown.js browser/components/places/tests/unit/test_clearHistory_shutdown.js
--- browser/components/places/tests/unit/test_clearHistory_shutdown.js
+++ browser/components/places/tests/unit/test_clearHistory_shutdown.js
@@ -24,17 +24,17 @@ var EXPECTED_NOTIFICATIONS = [
];
const UNEXPECTED_NOTIFICATIONS = [
"xpcom-shutdown",
];
const FTP_URL = "ftp://localhost/clearHistoryOnShutdown/";
-ChromeUtils.import("resource:///modules/Sanitizer.jsm");
+const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm");
// Send the profile-after-change notification to the form history component to ensure
// that it has been initialized.
var formHistoryStartup = Cc["@mozilla.org/satchel/form-history-startup;1"].
getService(Ci.nsIObserver);
formHistoryStartup.observe(null, "profile-after-change", null);
ChromeUtils.defineModuleGetter(this, "FormHistory",
"resource://gre/modules/FormHistory.jsm");
diff --git browser/components/pocket/content/Pocket.jsm browser/components/pocket/content/Pocket.jsm
--- browser/components/pocket/content/Pocket.jsm
+++ browser/components/pocket/content/Pocket.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["Pocket"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "BrowserUtils",
"resource://gre/modules/BrowserUtils.jsm");
var Pocket = {
get site() { return Services.prefs.getCharPref("extensions.pocket.site"); },
get listURL() { return "https://" + Pocket.site + "/?src=ff_ext"; },
diff --git browser/components/pocket/content/SaveToPocket.jsm browser/components/pocket/content/SaveToPocket.jsm
--- browser/components/pocket/content/SaveToPocket.jsm
+++ browser/components/pocket/content/SaveToPocket.jsm
@@ -1,17 +1,17 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "BrowserUtils",
"resource://gre/modules/BrowserUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PageActions",
"resource:///modules/PageActions.jsm");
ChromeUtils.defineModuleGetter(this, "Pocket",
"chrome://pocket/content/Pocket.jsm");
ChromeUtils.defineModuleGetter(this, "ReaderMode",
"resource://gre/modules/ReaderMode.jsm");
diff --git browser/components/pocket/content/pktApi.jsm browser/components/pocket/content/pktApi.jsm
--- browser/components/pocket/content/pktApi.jsm
+++ browser/components/pocket/content/pktApi.jsm
@@ -39,18 +39,18 @@
* Can be 0 for no premium and 1 for premium
* latestSince: Last timestamp a save happened
* tags: All tags for logged in user
* usedTags: All used tags from within the extension sorted by recency
*/
var EXPORTED_SYMBOLS = ["pktApi"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["XMLHttpRequest"]);
XPCOMUtils.defineLazyPreferenceGetter(this, "gCookieFirstPartyIsolate", "privacy.firstparty.isolate", false);
var pktApi = (function() {
/**
* Configuration
diff --git browser/components/preferences/blocklists.js browser/components/preferences/blocklists.js
--- browser/components/preferences/blocklists.js
+++ browser/components/preferences/blocklists.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const BASE_LIST_ID = "base";
const CONTENT_LIST_ID = "content";
const TRACK_SUFFIX = "-track-digest256";
const TRACKING_TABLE_PREF = "urlclassifier.trackingTable";
const LISTS_PREF_BRANCH = "browser.safebrowsing.provider.mozilla.lists.";
var gBlocklistManager = {
_type: "",
diff --git browser/components/preferences/browserLanguages.js browser/components/preferences/browserLanguages.js
--- browser/components/preferences/browserLanguages.js
+++ browser/components/preferences/browserLanguages.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* import-globals-from ../../../toolkit/content/preferencesBindings.js */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "AddonManager",
"resource://gre/modules/AddonManager.jsm");
ChromeUtils.defineModuleGetter(this, "AddonRepository",
"resource://gre/modules/addons/AddonRepository.jsm");
ChromeUtils.defineModuleGetter(this, "RemoteSettings",
"resource://services-settings/remote-settings.js");
ChromeUtils.defineModuleGetter(this, "SelectionChangedMenulist",
diff --git browser/components/preferences/clearSiteData.js browser/components/preferences/clearSiteData.js
--- browser/components/preferences/clearSiteData.js
+++ browser/components/preferences/clearSiteData.js
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/DownloadUtils.jsm");
-ChromeUtils.import("resource:///modules/SiteDataManager.jsm");
+const {DownloadUtils} = ChromeUtils.import("resource://gre/modules/DownloadUtils.jsm");
+const {SiteDataManager} = ChromeUtils.import("resource:///modules/SiteDataManager.jsm");
var gClearSiteDataDialog = {
_clearSiteDataCheckbox: null,
_clearCacheCheckbox: null,
_clearButton: null,
onLoad() {
document.mozSubdialogReady = this.init();
diff --git browser/components/preferences/containers.js browser/components/preferences/containers.js
--- browser/components/preferences/containers.js
+++ browser/components/preferences/containers.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/ContextualIdentityService.jsm");
+const {ContextualIdentityService} = ChromeUtils.import("resource://gre/modules/ContextualIdentityService.jsm");
/**
* We want to set the window title immediately to prevent flickers.
*/
function setTitle() {
let params = window.arguments[0] || {};
let winElem = document.documentElement;
diff --git browser/components/preferences/fonts.js browser/components/preferences/fonts.js
--- browser/components/preferences/fonts.js
+++ browser/components/preferences/fonts.js
@@ -101,17 +101,17 @@ var gFontsDialog = {
return;
}
let [title, warningMessage, confirmLabel] = await document.l10n.formatValues([
{id: "fonts-very-large-warning-title"},
{id: "fonts-very-large-warning-message"},
{id: "fonts-very-large-warning-accept"},
]);
- let {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
+ let {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
let flags = Services.prompt.BUTTON_POS_1 * Services.prompt.BUTTON_TITLE_CANCEL |
Services.prompt.BUTTON_POS_0 * Services.prompt.BUTTON_TITLE_IS_STRING |
Services.prompt.BUTTON_POS_1_DEFAULT;
let buttonChosen = Services.prompt.confirmEx(window, title, warningMessage, flags, confirmLabel, null, "", "", {});
if (buttonChosen != 0) {
menulist.value = oldValue;
}
},
diff --git browser/components/preferences/in-content/containers.js browser/components/preferences/in-content/containers.js
--- browser/components/preferences/in-content/containers.js
+++ browser/components/preferences/in-content/containers.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* import-globals-from preferences.js */
-ChromeUtils.import("resource://gre/modules/ContextualIdentityService.jsm");
+var {ContextualIdentityService} = ChromeUtils.import("resource://gre/modules/ContextualIdentityService.jsm");
const defaultContainerIcon = "fingerprint";
const defaultContainerColor = "blue";
let gContainersPane = {
init() {
this._list = document.getElementById("containersView");
diff --git browser/components/preferences/in-content/main.js browser/components/preferences/in-content/main.js
--- browser/components/preferences/in-content/main.js
+++ browser/components/preferences/in-content/main.js
@@ -2,23 +2,23 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* import-globals-from extensionControlled.js */
/* import-globals-from preferences.js */
/* import-globals-from ../../../../toolkit/mozapps/preferences/fontbuilder.js */
/* import-globals-from ../../../base/content/aboutDialog-appUpdater.js */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Downloads.jsm");
-ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
-ChromeUtils.import("resource:///modules/TransientPrefs.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/L10nRegistry.jsm");
-ChromeUtils.import("resource://gre/modules/Localization.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Downloads} = ChromeUtils.import("resource://gre/modules/Downloads.jsm");
+var {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+var {TransientPrefs} = ChromeUtils.import("resource:///modules/TransientPrefs.jsm");
+var {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+var {L10nRegistry} = ChromeUtils.import("resource://gre/modules/L10nRegistry.jsm");
+var {Localization} = ChromeUtils.import("resource://gre/modules/Localization.jsm");
ChromeUtils.defineModuleGetter(this, "CloudStorage",
"resource://gre/modules/CloudStorage.jsm");
ChromeUtils.defineModuleGetter(this, "SelectionChangedMenulist",
"resource:///modules/SelectionChangedMenulist.jsm");
ChromeUtils.defineModuleGetter(this, "UpdateUtils",
"resource://gre/modules/UpdateUtils.jsm");
XPCOMUtils.defineLazyServiceGetters(this, {
@@ -386,17 +386,17 @@ var gMainPane = {
this.updateOnScreenKeyboardVisibility();
// Show translation preferences if we may:
const prefName = "browser.translation.ui.show";
if (Services.prefs.getBoolPref(prefName)) {
let row = document.getElementById("translationBox");
row.removeAttribute("hidden");
// Showing attribution only for Bing Translator.
- ChromeUtils.import("resource:///modules/translation/Translation.jsm");
+ var {Translation} = ChromeUtils.import("resource:///modules/translation/Translation.jsm");
if (Translation.translationEngine == "Bing") {
document.getElementById("bingAttribution").removeAttribute("hidden");
}
}
if (AppConstants.MOZ_DEV_EDITION) {
let uAppData = OS.Constants.Path.userApplicationDataDir;
let ignoreSeparateProfile = OS.Path.join(uAppData, "ignore-dev-edition-profile");
@@ -1071,17 +1071,17 @@ var gMainPane = {
* Displays the translation exceptions dialog where specific site and language
* translation preferences can be set.
*/
showTranslationExceptions() {
gSubDialog.open("chrome://browser/content/preferences/translation.xul");
},
openTranslationProviderAttribution() {
- ChromeUtils.import("resource:///modules/translation/Translation.jsm");
+ var {Translation} = ChromeUtils.import("resource:///modules/translation/Translation.jsm");
Translation.openProviderAttribution();
},
/**
* Displays the fonts dialog, where web page font names and sizes can be
* configured.
*/
configureFonts() {
diff --git browser/components/preferences/in-content/preferences.js browser/components/preferences/in-content/preferences.js
--- browser/components/preferences/in-content/preferences.js
+++ browser/components/preferences/in-content/preferences.js
@@ -11,17 +11,17 @@
/* import-globals-from privacy.js */
/* import-globals-from sync.js */
/* import-globals-from findInPage.js */
/* import-globals-from ../../../base/content/utilityOverlay.js */
/* import-globals-from ../../../../toolkit/content/preferencesBindings.js */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "formAutofillParent",
"resource://formautofill/FormAutofillParent.jsm");
var gLastHash = "";
var gCategoryInits = new Map();
function init_category_if_required(category) {
diff --git browser/components/preferences/in-content/privacy.js browser/components/preferences/in-content/privacy.js
--- browser/components/preferences/in-content/privacy.js
+++ browser/components/preferences/in-content/privacy.js
@@ -3,24 +3,24 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* import-globals-from extensionControlled.js */
/* import-globals-from preferences.js */
/* FIXME: ESlint globals workaround should be removed once bug 1395426 gets fixed */
/* globals DownloadUtils, LoadContextInfo */
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+var {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
ChromeUtils.defineModuleGetter(this, "LoginHelper",
"resource://gre/modules/LoginHelper.jsm");
ChromeUtils.defineModuleGetter(this, "SiteDataManager",
"resource:///modules/SiteDataManager.jsm");
-ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
+var {PrivateBrowsingUtils} = ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
const PREF_UPLOAD_ENABLED = "datareporting.healthreport.uploadEnabled";
const TRACKING_PROTECTION_KEY = "websites.trackingProtectionMode";
const TRACKING_PROTECTION_PREFS = ["privacy.trackingprotection.enabled",
"privacy.trackingprotection.pbmode.enabled"];
const PREF_OPT_OUT_STUDIES_ENABLED = "app.shield.optoutstudies.enabled";
diff --git browser/components/preferences/in-content/sync.js browser/components/preferences/in-content/sync.js
--- browser/components/preferences/in-content/sync.js
+++ browser/components/preferences/in-content/sync.js
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* import-globals-from preferences.js */
-ChromeUtils.import("resource://services-sync/main.js");
-ChromeUtils.import("resource://gre/modules/FxAccounts.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Weave} = ChromeUtils.import("resource://services-sync/main.js");
+var {FxAccounts, fxAccounts} = ChromeUtils.import("resource://gre/modules/FxAccounts.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyGetter(this, "FxAccountsCommon", function() {
return ChromeUtils.import("resource://gre/modules/FxAccountsCommon.js", {});
});
XPCOMUtils.defineLazyModuleGetters(this, {
SyncDisconnect: "resource://services-sync/SyncDisconnect.jsm",
UIState: "resource://services-sync/UIState.jsm",
diff --git browser/components/preferences/in-content/syncDisconnect.js browser/components/preferences/in-content/syncDisconnect.js
--- browser/components/preferences/in-content/syncDisconnect.js
+++ browser/components/preferences/in-content/syncDisconnect.js
@@ -1,13 +1,13 @@
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
SyncDisconnect: "resource://services-sync/SyncDisconnect.jsm",
});
let gSyncDisconnectDialog = {
init() {
if (SyncDisconnect.promiseDisconnectFinished) {
diff --git browser/components/preferences/in-content/tests/browser_browser_languages_subdialog.js browser/components/preferences/in-content/tests/browser_browser_languages_subdialog.js
--- browser/components/preferences/in-content/tests/browser_browser_languages_subdialog.js
+++ browser/components/preferences/in-content/tests/browser_browser_languages_subdialog.js
@@ -1,13 +1,13 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm", this);
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
AddonTestUtils.initMochitest(this);
const BROWSER_LANGUAGES_URL = "chrome://browser/content/preferences/browserLanguages.xul";
const DICTIONARY_ID_PL = "pl@dictionaries.addons.mozilla.org";
const TELEMETRY_CATEGORY = "intl.ui.browserLanguage";
diff --git browser/components/preferences/in-content/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.js browser/components/preferences/in-content/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.js
--- browser/components/preferences/in-content/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.js
+++ browser/components/preferences/in-content/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.js
@@ -1,9 +1,9 @@
-const {Utils} = ChromeUtils.import("resource://gre/modules/sessionstore/Utils.jsm", {});
+const {Utils} = ChromeUtils.import("resource://gre/modules/sessionstore/Utils.jsm");
const triggeringPrincipal_base64 = Utils.SERIALIZED_SYSTEMPRINCIPAL;
add_task(async function() {
waitForExplicitFinish();
const tabURL = getRootDirectory(gTestPath) + "browser_bug1184989_prevent_scrolling_when_preferences_flipped.xul";
await BrowserTestUtils.withNewTab({ gBrowser, url: tabURL }, async function(browser) {
diff --git browser/components/preferences/in-content/tests/browser_cloud_storage.js browser/components/preferences/in-content/tests/browser_cloud_storage.js
--- browser/components/preferences/in-content/tests/browser_cloud_storage.js
+++ browser/components/preferences/in-content/tests/browser_cloud_storage.js
@@ -1,15 +1,15 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
ChromeUtils.defineModuleGetter(this, "FileUtils",
"resource://gre/modules/FileUtils.jsm");
ChromeUtils.defineModuleGetter(this, "NetUtil",
"resource://gre/modules/NetUtil.jsm");
const DROPBOX_DOWNLOAD_FOLDER = "Dropbox";
const DROPBOX_CONFIG_FOLDER = (AppConstants.platform === "win") ? "Dropbox" :
".dropbox";
diff --git browser/components/preferences/in-content/tests/browser_connection.js browser/components/preferences/in-content/tests/browser_connection.js
--- browser/components/preferences/in-content/tests/browser_connection.js
+++ browser/components/preferences/in-content/tests/browser_connection.js
@@ -1,14 +1,14 @@
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
function test() {
waitForExplicitFinish();
// network.proxy.type needs to be backed up and restored because mochitest
// changes this setting from the default
let oldNetworkProxyType = Services.prefs.getIntPref("network.proxy.type");
registerCleanupFunction(function() {
diff --git browser/components/preferences/in-content/tests/browser_connection_bug388287.js browser/components/preferences/in-content/tests/browser_connection_bug388287.js
--- browser/components/preferences/in-content/tests/browser_connection_bug388287.js
+++ browser/components/preferences/in-content/tests/browser_connection_bug388287.js
@@ -1,13 +1,13 @@
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
function test() {
waitForExplicitFinish();
const connectionURL = "chrome://browser/content/preferences/connection.xul";
let closeable = false;
let finalTest = false;
// The changed preferences need to be backed up and restored because this mochitest
diff --git browser/components/preferences/in-content/tests/browser_connection_dnsoverhttps.js browser/components/preferences/in-content/tests/browser_connection_dnsoverhttps.js
--- browser/components/preferences/in-content/tests/browser_connection_dnsoverhttps.js
+++ browser/components/preferences/in-content/tests/browser_connection_dnsoverhttps.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const SUBDIALOG_URL = "chrome://browser/content/preferences/connection.xul";
const TRR_MODE_PREF = "network.trr.mode";
const TRR_URI_PREF = "network.trr.uri";
const TRR_CUSTOM_URI_PREF = "network.trr.custom_uri";
const modeCheckboxSelector = "#networkDnsOverHttps";
const uriTextboxSelector = "#customDnsOverHttpsInput";
diff --git browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js
--- browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js
+++ browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource:///modules/HomePage.jsm");
+var {HomePage} = ChromeUtils.import("resource:///modules/HomePage.jsm");
add_task(async function testSetHomepageUseCurrent() {
is(gBrowser.currentURI.spec, "about:blank", "Test starts with about:blank open");
await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:home");
await openPreferencesViaOpenPreferencesAPI("paneHome", {leaveOpen: true});
// eslint-disable-next-line mozilla/no-cpows-in-tests
let doc = gBrowser.contentDocument;
is(gBrowser.currentURI.spec, "about:preferences#home",
diff --git browser/components/preferences/in-content/tests/browser_permissions_dialog.js browser/components/preferences/in-content/tests/browser_permissions_dialog.js
--- browser/components/preferences/in-content/tests/browser_permissions_dialog.js
+++ browser/components/preferences/in-content/tests/browser_permissions_dialog.js
@@ -1,16 +1,16 @@
"use strict";
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource:///modules/SitePermissions.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {SitePermissions} = ChromeUtils.import("resource:///modules/SitePermissions.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const PERMISSIONS_URL = "chrome://browser/content/preferences/sitePermissions.xul";
const URL = "http://www.example.com";
const URI = Services.io.newURI(URL);
var sitePermissionsDialog;
function checkPermissionItem(origin, state) {
let doc = sitePermissionsDialog.document;
diff --git browser/components/preferences/in-content/tests/browser_proxy_backup.js browser/components/preferences/in-content/tests/browser_proxy_backup.js
--- browser/components/preferences/in-content/tests/browser_proxy_backup.js
+++ browser/components/preferences/in-content/tests/browser_proxy_backup.js
@@ -1,14 +1,14 @@
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
function test() {
waitForExplicitFinish();
// network.proxy.type needs to be backed up and restored because mochitest
// changes this setting from the default
let oldNetworkProxyType = Services.prefs.getIntPref("network.proxy.type");
registerCleanupFunction(function() {
diff --git browser/components/preferences/in-content/tests/browser_sync_sanitize.js browser/components/preferences/in-content/tests/browser_sync_sanitize.js
--- browser/components/preferences/in-content/tests/browser_sync_sanitize.js
+++ browser/components/preferences/in-content/tests/browser_sync_sanitize.js
@@ -1,19 +1,19 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
/* global sinon */
"use strict";
-const {UIState} = ChromeUtils.import("resource://services-sync/UIState.jsm", {});
-const {Log} = ChromeUtils.import("resource://gre/modules/Log.jsm", {});
-const {AsyncShutdown} = ChromeUtils.import("resource://gre/modules/AsyncShutdown.jsm", {});
+const {UIState} = ChromeUtils.import("resource://services-sync/UIState.jsm");
+const {Log} = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const {AsyncShutdown} = ChromeUtils.import("resource://gre/modules/AsyncShutdown.jsm");
-const {SyncDisconnect, SyncDisconnectInternal} = ChromeUtils.import("resource://services-sync/SyncDisconnect.jsm", {});
+const {SyncDisconnect, SyncDisconnectInternal} = ChromeUtils.import("resource://services-sync/SyncDisconnect.jsm", null);
var fxAccountsCommon = {};
ChromeUtils.import("resource://gre/modules/FxAccountsCommon.js", fxAccountsCommon);
// Use sinon for mocking.
Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js");
registerCleanupFunction(() => {
delete window.sinon; // test fails with this reference left behind.
diff --git browser/components/preferences/in-content/tests/siteData/browser_clearSiteData.js browser/components/preferences/in-content/tests/siteData/browser_clearSiteData.js
--- browser/components/preferences/in-content/tests/siteData/browser_clearSiteData.js
+++ browser/components/preferences/in-content/tests/siteData/browser_clearSiteData.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-ChromeUtils.import("resource:///modules/SitePermissions.jsm");
+var {SitePermissions} = ChromeUtils.import("resource:///modules/SitePermissions.jsm");
async function testClearData(clearSiteData, clearCache) {
let quotaURI = Services.io.newURI(TEST_QUOTA_USAGE_ORIGIN);
SitePermissions.set(quotaURI, "persistent-storage", SitePermissions.ALLOW);
// Open a test site which saves into appcache.
await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_OFFLINE_URL);
BrowserTestUtils.removeTab(gBrowser.selectedTab);
diff --git browser/components/preferences/in-content/tests/siteData/head.js browser/components/preferences/in-content/tests/siteData/head.js
--- browser/components/preferences/in-content/tests/siteData/head.js
+++ browser/components/preferences/in-content/tests/siteData/head.js
@@ -8,19 +8,19 @@ const TEST_QUOTA_USAGE_ORIGIN = "https:/
const TEST_QUOTA_USAGE_URL = getRootDirectory(gTestPath).replace("chrome://mochitests/content", TEST_QUOTA_USAGE_ORIGIN) + "/site_data_test.html";
const TEST_OFFLINE_HOST = "example.org";
const TEST_OFFLINE_ORIGIN = "https://" + TEST_OFFLINE_HOST;
const TEST_OFFLINE_URL = getRootDirectory(gTestPath).replace("chrome://mochitests/content", TEST_OFFLINE_ORIGIN) + "/offline/offline.html";
const TEST_SERVICE_WORKER_URL = getRootDirectory(gTestPath).replace("chrome://mochitests/content", TEST_OFFLINE_ORIGIN) + "/service_worker_test.html";
const REMOVE_DIALOG_URL = "chrome://browser/content/preferences/siteDataRemoveSelected.xul";
-const { DownloadUtils } = ChromeUtils.import("resource://gre/modules/DownloadUtils.jsm", {});
-const { SiteDataManager } = ChromeUtils.import("resource:///modules/SiteDataManager.jsm", {});
-const { OfflineAppCacheHelper } = ChromeUtils.import("resource://gre/modules/offlineAppCache.jsm", {});
+const { DownloadUtils } = ChromeUtils.import("resource://gre/modules/DownloadUtils.jsm");
+const { SiteDataManager } = ChromeUtils.import("resource:///modules/SiteDataManager.jsm");
+const { OfflineAppCacheHelper } = ChromeUtils.import("resource://gre/modules/offlineAppCache.jsm");
ChromeUtils.defineModuleGetter(this, "SiteDataTestUtils",
"resource://testing-common/SiteDataTestUtils.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "serviceWorkerManager", "@mozilla.org/serviceworkers/manager;1", "nsIServiceWorkerManager");
function promiseSiteDataManagerSitesUpdated() {
return TestUtils.topicObserved("sitedatamanager:sites-updated", () => true);
diff --git browser/components/preferences/languages.js browser/components/preferences/languages.js
--- browser/components/preferences/languages.js
+++ browser/components/preferences/languages.js
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* import-globals-from ../../../toolkit/content/preferencesBindings.js */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Preferences.addAll([
{ id: "intl.accept_languages", type: "wstring" },
{ id: "pref.browser.language.disable_button.up", type: "bool" },
{ id: "pref.browser.language.disable_button.down", type: "bool" },
{ id: "pref.browser.language.disable_button.remove", type: "bool" },
{ id: "privacy.spoof_english", type: "int" },
]);
diff --git browser/components/preferences/permissions.js browser/components/preferences/permissions.js
--- browser/components/preferences/permissions.js
+++ browser/components/preferences/permissions.js
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
const permissionExceptionsL10n = {
"trackingprotection": {
window: "permissions-exceptions-content-blocking-window",
description: "permissions-exceptions-content-blocking-desc",
},
"cookie": {
window: "permissions-exceptions-cookie-window",
diff --git browser/components/preferences/selectBookmark.js browser/components/preferences/selectBookmark.js
--- browser/components/preferences/selectBookmark.js
+++ browser/components/preferences/selectBookmark.js
@@ -1,15 +1,15 @@
//* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* Shared Places Import - change other consumers if you change this: */
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
PlacesUIUtils: "resource:///modules/PlacesUIUtils.jsm",
PlacesTransactions: "resource://gre/modules/PlacesTransactions.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
});
XPCOMUtils.defineLazyScriptGetter(this, "PlacesTreeView",
"chrome://browser/content/places/treeView.js");
diff --git browser/components/preferences/siteDataSettings.js browser/components/preferences/siteDataSettings.js
--- browser/components/preferences/siteDataSettings.js
+++ browser/components/preferences/siteDataSettings.js
@@ -1,14 +1,14 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "SiteDataManager",
"resource:///modules/SiteDataManager.jsm");
ChromeUtils.defineModuleGetter(this, "DownloadUtils",
"resource://gre/modules/DownloadUtils.jsm");
"use strict";
diff --git browser/components/preferences/sitePermissions.js browser/components/preferences/sitePermissions.js
--- browser/components/preferences/sitePermissions.js
+++ browser/components/preferences/sitePermissions.js
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* import-globals-from in-content/extensionControlled.js */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource:///modules/SitePermissions.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {SitePermissions} = ChromeUtils.import("resource:///modules/SitePermissions.jsm");
const sitePermissionsL10n = {
"desktop-notification": {
window: "permissions-site-notification-window",
description: "permissions-site-notification-desc",
disableLabel: "permissions-site-notification-disable-label",
disableDescription: "permissions-site-notification-disable-desc",
},
diff --git browser/components/preferences/translation.js browser/components/preferences/translation.js
--- browser/components/preferences/translation.js
+++ browser/components/preferences/translation.js
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const kPermissionType = "translate";
const kLanguagesPref = "browser.translation.neverForLanguages";
function Tree(aId, aData) {
this._data = aData;
this._tree = document.getElementById(aId);
this._tree.view = this;
diff --git browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cache.js browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cache.js
--- browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cache.js
+++ browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cache.js
@@ -3,17 +3,17 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
// Check about:cache after private browsing
// This test covers MozTrap test 6047
// bug 880621
var tmp = {};
-const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm", {});
+const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm");
function test() {
waitForExplicitFinish();
Sanitizer.sanitize(["cache"], {ignoreTimespan: false});
getStorageEntryCount("regular", function(nrEntriesR1) {
diff --git browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_toggle.js browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_toggle.js
--- browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_toggle.js
+++ browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_toggle.js
@@ -1,10 +1,10 @@
-ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
-ChromeUtils.import("resource://gre/modules/DownloadLastDir.jsm");
+const {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+const {DownloadLastDir} = ChromeUtils.import("resource://gre/modules/DownloadLastDir.jsm");
/**
* Tests how the browser remembers the last download folder
* from download to download, with a particular emphasis
* on how it behaves when private browsing windows open.
*/
add_task(async function test_downloads_last_dir_toggle() {
let tmpDir = FileUtils.getDir("TmpD", [], true);
diff --git browser/components/privatebrowsing/test/browser/head.js browser/components/privatebrowsing/test/browser/head.js
--- browser/components/privatebrowsing/test/browser/head.js
+++ browser/components/privatebrowsing/test/browser/head.js
@@ -1,13 +1,13 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
-var {PromiseUtils} = ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm", {});
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {PromiseUtils} = ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesTestUtils",
"resource://testing-common/PlacesTestUtils.jsm");
ChromeUtils.defineModuleGetter(this, "TestUtils",
"resource://testing-common/TestUtils.jsm");
function whenNewWindowLoaded(aOptions, aCallback) {
diff --git browser/components/protocolhandler/WebProtocolHandlerRegistrar.js browser/components/protocolhandler/WebProtocolHandlerRegistrar.js
--- browser/components/protocolhandler/WebProtocolHandlerRegistrar.js
+++ browser/components/protocolhandler/WebProtocolHandlerRegistrar.js
@@ -1,15 +1,15 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
const STRING_BUNDLE_URI = "chrome://browser/locale/feeds/subscribe.properties";
function WebProtocolHandlerRegistrar() {
}
WebProtocolHandlerRegistrar.prototype = {
get stringBundle() {
diff --git browser/components/resistfingerprinting/test/chrome/test_bug1409973_date_time_format.html browser/components/resistfingerprinting/test/chrome/test_bug1409973_date_time_format.html
--- browser/components/resistfingerprinting/test/chrome/test_bug1409973_date_time_format.html
+++ browser/components/resistfingerprinting/test/chrome/test_bug1409973_date_time_format.html
@@ -1,15 +1,15 @@
<!DOCTYPE html>
<meta charset="utf-8">
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script>
/* globals SpecialPowers, SimpleTest */
- ChromeUtils.import("resource://gre/modules/Services.jsm");
+ const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
SimpleTest.waitForExplicitFinish();
const originalAvailable = Services.locale.availableLocales;
const originalRequested = Services.locale.requestedLocales;
Services.locale.availableLocales = ["ko-KR"];
Services.locale.requestedLocales = ["ko-KR"];
diff --git browser/components/safebrowsing/content/test/head.js browser/components/safebrowsing/content/test/head.js
--- browser/components/safebrowsing/content/test/head.js
+++ browser/components/safebrowsing/content/test/head.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
// This url must sync with the table, url in SafeBrowsing.jsm addMozEntries
const PHISH_TABLE = "test-phish-simple";
const PHISH_URL = "https://www.itisatrap.org/firefox/its-a-trap.html";
/**
* Waits for a load (or custom) event to finish in a given tab. If provided
diff --git browser/components/search/SearchTelemetry.jsm browser/components/search/SearchTelemetry.jsm
--- browser/components/search/SearchTelemetry.jsm
+++ browser/components/search/SearchTelemetry.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["SearchTelemetry"];
-const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", null);
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
Services: "resource://gre/modules/Services.jsm",
});
// The various histograms and scalars that we report to.
const SEARCH_COUNTS_HISTOGRAM_KEY = "SEARCH_COUNTS";
const SEARCH_WITH_ADS_SCALAR = "browser.search.with_ads";
diff --git browser/components/search/test/browser/SearchTestUtils.jsm browser/components/search/test/browser/SearchTestUtils.jsm
--- browser/components/search/test/browser/SearchTestUtils.jsm
+++ browser/components/search/test/browser/SearchTestUtils.jsm
@@ -1,11 +1,11 @@
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var EXPORTED_SYMBOLS = [
"SearchTestUtils",
];
var gTestGlobals;
var SearchTestUtils = Object.freeze({
diff --git browser/components/search/test/browser/browser_searchTelemetry.js browser/components/search/test/browser/browser_searchTelemetry.js
--- browser/components/search/test/browser/browser_searchTelemetry.js
+++ browser/components/search/test/browser/browser_searchTelemetry.js
@@ -2,17 +2,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
/*
* Main tests for SearchTelemetry - general engine visiting and link clicking.
*/
"use strict";
-const {SearchTelemetry} = ChromeUtils.import("resource:///modules/SearchTelemetry.jsm", null);
+const {SearchTelemetry} = ChromeUtils.import("resource:///modules/SearchTelemetry.jsm");
const TEST_PROVIDER_INFO = {
"example": {
"regexp": /^http:\/\/mochi.test:.+\/browser\/browser\/components\/search\/test\/browser\/searchTelemetry(?:Ad)?.html/,
"queryParam": "s",
"codeParam": "abc",
"codePrefixes": ["ff"],
"followonParams": ["a"],
diff --git browser/components/search/test/browser/head.js browser/components/search/test/browser/head.js
--- browser/components/search/test/browser/head.js
+++ browser/components/search/test/browser/head.js
@@ -90,17 +90,17 @@ function promiseNewEngine(basename, opti
});
},
});
});
}
let promiseStateChangeFrameScript = "data:," + encodeURIComponent(`(${
() => {
- ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+ const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
/* globals docShell, sendAsyncMessage */
const global = this;
const LISTENER = Symbol("listener");
let listener = {
QueryInterface: ChromeUtils.generateQI(["nsISupportsWeakReference",
"nsIWebProgressListener"]),
diff --git browser/components/search/test/unit/test_urlTelemetry.js browser/components/search/test/unit/test_urlTelemetry.js
--- browser/components/search/test/unit/test_urlTelemetry.js
+++ browser/components/search/test/unit/test_urlTelemetry.js
@@ -1,13 +1,13 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/SearchTelemetry.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {SearchTelemetry} = ChromeUtils.import("resource:///modules/SearchTelemetry.jsm");
add_task(async function test_parsing_search_urls() {
let hs;
// Google search access point.
SearchTelemetry.updateTrackingStatus({}, "https://www.google.com/search?q=test&ie=utf-8&oe=utf-8&client=firefox-b-1-ab");
hs = Services.telemetry.getKeyedHistogramById("SEARCH_COUNTS").snapshot();
Assert.ok(hs);
Assert.ok("google.in-content:sap:firefox-b-1-ab" in hs, "The histogram must contain the correct key");
diff --git browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
--- browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
+++ browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var EXPORTED_SYMBOLS = ["RecentlyClosedTabsAndWindowsMenuUtils"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "PluralForm",
"resource://gre/modules/PluralForm.jsm");
ChromeUtils.defineModuleGetter(this, "SessionStore",
"resource:///modules/sessionstore/SessionStore.jsm");
var navigatorBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
diff --git browser/components/sessionstore/SessionFile.jsm browser/components/sessionstore/SessionFile.jsm
--- browser/components/sessionstore/SessionFile.jsm
+++ browser/components/sessionstore/SessionFile.jsm
@@ -20,20 +20,20 @@ var EXPORTED_SYMBOLS = ["SessionFile"];
*
* Otherwise, we could encounter bugs, especially under Windows,
* e.g. if a request attempts to write sessionstore.js while
* another attempts to copy that file.
*
* This implementation uses OS.File, which guarantees property 1.
*/
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/osfile.jsm");
-ChromeUtils.import("resource://gre/modules/AsyncShutdown.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
+const {AsyncShutdown} = ChromeUtils.import("resource://gre/modules/AsyncShutdown.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "Telemetry",
"@mozilla.org/base/telemetry;1", "nsITelemetry");
XPCOMUtils.defineLazyModuleGetters(this, {
RunState: "resource:///modules/sessionstore/RunState.jsm",
SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
diff --git browser/components/sessionstore/SessionStartup.jsm browser/components/sessionstore/SessionStartup.jsm
--- browser/components/sessionstore/SessionStartup.jsm
+++ browser/components/sessionstore/SessionStartup.jsm
@@ -28,17 +28,17 @@
* This service will always resume the session if the integer pref
* browser.startup.page is set to 3.
*/
var EXPORTED_SYMBOLS = ["SessionStartup"];
/* :::::::: Constants and Helpers ::::::::::::::: */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "SessionFile",
"resource:///modules/sessionstore/SessionFile.jsm");
ChromeUtils.defineModuleGetter(this, "StartupPerformance",
"resource:///modules/sessionstore/StartupPerformance.jsm");
ChromeUtils.defineModuleGetter(this, "CrashMonitor",
"resource://gre/modules/CrashMonitor.jsm");
ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
diff --git browser/components/sessionstore/SessionStorage.jsm browser/components/sessionstore/SessionStorage.jsm
--- browser/components/sessionstore/SessionStorage.jsm
+++ browser/components/sessionstore/SessionStorage.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["SessionStorage"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const ssu = Cc["@mozilla.org/browser/sessionstore/utils;1"]
.createInstance(Ci.nsISessionStoreUtils);
// A bound to the size of data to store for DOM Storage.
const DOM_STORAGE_LIMIT_PREF = "browser.sessionstore.dom_storage_limit";
// Returns the principal for a given |frame| contained in a given |docShell|.
diff --git browser/components/sessionstore/content/aboutSessionRestore.js browser/components/sessionstore/content/aboutSessionRestore.js
--- browser/components/sessionstore/content/aboutSessionRestore.js
+++ browser/components/sessionstore/content/aboutSessionRestore.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm");
ChromeUtils.defineModuleGetter(this, "SessionStore",
"resource:///modules/sessionstore/SessionStore.jsm");
var gStateObject;
var gTreeData;
diff --git browser/components/sessionstore/content/content-sessionStore.js browser/components/sessionstore/content/content-sessionStore.js
--- browser/components/sessionstore/content/content-sessionStore.js
+++ browser/components/sessionstore/content/content-sessionStore.js
@@ -1,11 +1,11 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* eslint-env mozilla/frame-script */
"use strict";
-ChromeUtils.import("resource:///modules/sessionstore/ContentSessionStore.jsm");
+const {ContentSessionStore} = ChromeUtils.import("resource:///modules/sessionstore/ContentSessionStore.jsm");
void new ContentSessionStore(this);
diff --git browser/components/sessionstore/test/browser_394759_basic.js browser/components/sessionstore/test/browser_394759_basic.js
--- browser/components/sessionstore/test/browser_394759_basic.js
+++ browser/components/sessionstore/test/browser_394759_basic.js
@@ -2,17 +2,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const TEST_URL = "data:text/html;charset=utf-8,<input%20id=txt>" +
"<input%20type=checkbox%20id=chk>";
-ChromeUtils.import("resource:///modules/sessionstore/SessionStore.jsm");
+const {SessionStore} = ChromeUtils.import("resource:///modules/sessionstore/SessionStore.jsm");
/**
* This test ensures that closing a window is a reversible action. We will
* close the the window, restore it and check that all data has been restored.
* This includes window-specific data as well as form data for tabs.
*/
function test() {
waitForExplicitFinish();
diff --git browser/components/sessionstore/test/browser_394759_purge.js browser/components/sessionstore/test/browser_394759_purge.js
--- browser/components/sessionstore/test/browser_394759_purge.js
+++ browser/components/sessionstore/test/browser_394759_purge.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-let {ForgetAboutSite} = ChromeUtils.import("resource://gre/modules/ForgetAboutSite.jsm", {});
+let {ForgetAboutSite} = ChromeUtils.import("resource://gre/modules/ForgetAboutSite.jsm");
function promiseClearHistory() {
return new Promise(resolve => {
let observer = {
observe(aSubject, aTopic, aData) {
Services.obs.removeObserver(this, "browser:purge-domain-data");
resolve();
},
diff --git browser/components/sessionstore/test/browser_461634.js browser/components/sessionstore/test/browser_461634.js
--- browser/components/sessionstore/test/browser_461634.js
+++ browser/components/sessionstore/test/browser_461634.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource:///modules/sessionstore/SessionStore.jsm");
+const {SessionStore} = ChromeUtils.import("resource:///modules/sessionstore/SessionStore.jsm");
add_task(async function testClosedTabData() {
/** Test for Bug 461634 **/
const REMEMBER = Date.now(), FORGET = Math.random();
let test_state = { windows: [{ "tabs": [{ "entries": [] }], _closedTabs: [
{ state: { entries: [{ url: "http://www.example.net/" }] }, title: FORGET },
{ state: { entries: [{ url: "http://www.example.net/" }] }, title: REMEMBER },
diff --git browser/components/sessionstore/test/browser_464199.js browser/components/sessionstore/test/browser_464199.js
--- browser/components/sessionstore/test/browser_464199.js
+++ browser/components/sessionstore/test/browser_464199.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-let {ForgetAboutSite} = ChromeUtils.import("resource://gre/modules/ForgetAboutSite.jsm", {});
+let {ForgetAboutSite} = ChromeUtils.import("resource://gre/modules/ForgetAboutSite.jsm");
function promiseClearHistory() {
return new Promise(resolve => {
let observer = {
observe(aSubject, aTopic, aData) {
Services.obs.removeObserver(this, "browser:purge-domain-data");
resolve();
},
diff --git browser/components/sessionstore/test/browser_send_async_message_oom.js browser/components/sessionstore/test/browser_send_async_message_oom.js
--- browser/components/sessionstore/test/browser_send_async_message_oom.js
+++ browser/components/sessionstore/test/browser_send_async_message_oom.js
@@ -1,13 +1,13 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
/* eslint-disable mozilla/no-arbitrary-setTimeout */
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const HISTOGRAM_NAME = "FX_SESSION_RESTORE_SEND_UPDATE_CAUSED_OOM";
/**
* Test that an OOM in sendAsyncMessage in a framescript will be reported
* to Telemetry.
*/
diff --git browser/components/sessionstore/test/browser_sessionStoreContainer.js browser/components/sessionstore/test/browser_sessionStoreContainer.js
--- browser/components/sessionstore/test/browser_sessionStoreContainer.js
+++ browser/components/sessionstore/test/browser_sessionStoreContainer.js
@@ -97,17 +97,17 @@ function waitForNewCookie() {
add_task(async function test() {
const USER_CONTEXTS = [
"default",
"personal",
"work",
];
- const { TabStateFlusher } = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
+ const { TabStateFlusher } = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm");
// Make sure userContext is enabled.
await SpecialPowers.pushPrefEnv({
"set": [ [ "privacy.userContext.enabled", true ] ],
});
Services.cookies.removeAll();
diff --git browser/components/sessionstore/test/browser_undoCloseById.js browser/components/sessionstore/test/browser_undoCloseById.js
--- browser/components/sessionstore/test/browser_undoCloseById.js
+++ browser/components/sessionstore/test/browser_undoCloseById.js
@@ -1,16 +1,16 @@
/* eslint-disable mozilla/no-arbitrary-setTimeout */
"use strict";
/**
* This test is for the undoCloseById function.
*/
-ChromeUtils.import("resource:///modules/sessionstore/SessionStore.jsm");
+const {SessionStore} = ChromeUtils.import("resource:///modules/sessionstore/SessionStore.jsm");
async function openAndCloseTab(window, url) {
let tab = BrowserTestUtils.addTab(window.gBrowser, url);
await promiseBrowserLoaded(tab.linkedBrowser, true, url);
await TabStateFlusher.flush(tab.linkedBrowser);
await promiseRemoveTabAndSessionState(tab);
}
diff --git browser/components/sessionstore/test/head.js browser/components/sessionstore/test/head.js
--- browser/components/sessionstore/test/head.js
+++ browser/components/sessionstore/test/head.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const {Utils} = ChromeUtils.import("resource://gre/modules/sessionstore/Utils.jsm", {});
+const {Utils} = ChromeUtils.import("resource://gre/modules/sessionstore/Utils.jsm");
const triggeringPrincipal_base64 = Utils.SERIALIZED_SYSTEMPRINCIPAL;
const TAB_STATE_NEEDS_RESTORE = 1;
const TAB_STATE_RESTORING = 2;
const ROOT = getRootDirectory(gTestPath);
const HTTPROOT = ROOT.replace("chrome://mochitests/content/", "http://example.com/");
const FRAME_SCRIPTS = [
@@ -20,20 +20,20 @@ for (let script of FRAME_SCRIPTS) {
}
registerCleanupFunction(() => {
for (let script of FRAME_SCRIPTS) {
Services.mm.removeDelayedFrameScript(script, true);
}
});
-const {SessionSaver} = ChromeUtils.import("resource:///modules/sessionstore/SessionSaver.jsm", {});
-const {SessionFile} = ChromeUtils.import("resource:///modules/sessionstore/SessionFile.jsm", {});
-const {TabState} = ChromeUtils.import("resource:///modules/sessionstore/TabState.jsm", {});
-const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
+const {SessionSaver} = ChromeUtils.import("resource:///modules/sessionstore/SessionSaver.jsm");
+const {SessionFile} = ChromeUtils.import("resource:///modules/sessionstore/SessionFile.jsm");
+const {TabState} = ChromeUtils.import("resource:///modules/sessionstore/TabState.jsm");
+const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm");
const ss = SessionStore;
// Some tests here assume that all restored tabs are loaded without waiting for
// the user to bring them to the foreground. We ensure this by resetting the
// related preference (see the "firefox.js" defaults file for details).
Services.prefs.setBoolPref("browser.sessionstore.restore_on_demand", false);
registerCleanupFunction(function() {
Services.prefs.clearUserPref("browser.sessionstore.restore_on_demand");
diff --git browser/components/sessionstore/test/unit/head.js browser/components/sessionstore/test/unit/head.js
--- browser/components/sessionstore/test/unit/head.js
+++ browser/components/sessionstore/test/unit/head.js
@@ -1,10 +1,10 @@
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm", {});
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
ChromeUtils.defineModuleGetter(this, "SessionStartup",
"resource:///modules/sessionstore/SessionStartup.jsm");
// Call a function once initialization of SessionStartup is complete
function afterSessionStartupInitialization(cb) {
info("Waiting for session startup initialization");
let observer = function() {
try {
@@ -14,17 +14,17 @@ function afterSessionStartupInitializati
} catch (ex) {
do_throw(ex);
}
};
Services.obs.addObserver(observer, "sessionstore-state-finalized");
// We need the Crash Monitor initialized for sessionstartup to run
// successfully.
- ChromeUtils.import("resource://gre/modules/CrashMonitor.jsm");
+ const {CrashMonitor} = ChromeUtils.import("resource://gre/modules/CrashMonitor.jsm");
CrashMonitor.init();
// Start sessionstartup initialization.
SessionStartup.init();
}
// Compress the source file using lz4 and put the result to destination file.
// After that, source file is deleted.
diff --git browser/components/sessionstore/test/unit/test_backup_once.js browser/components/sessionstore/test/unit/test_backup_once.js
--- browser/components/sessionstore/test/unit/test_backup_once.js
+++ browser/components/sessionstore/test/unit/test_backup_once.js
@@ -1,15 +1,15 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", {});
-var {SessionWorker} = ChromeUtils.import("resource:///modules/sessionstore/SessionWorker.jsm", {});
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {SessionWorker} = ChromeUtils.import("resource:///modules/sessionstore/SessionWorker.jsm");
var File = OS.File;
var Paths;
var SessionFile;
// We need a XULAppInfo to initialize SessionFile
ChromeUtils.import("resource://testing-common/AppInfo.jsm", this);
updateAppInfo({
diff --git browser/components/sessionstore/test/unit/test_migration_lz4compression.js browser/components/sessionstore/test/unit/test_migration_lz4compression.js
--- browser/components/sessionstore/test/unit/test_migration_lz4compression.js
+++ browser/components/sessionstore/test/unit/test_migration_lz4compression.js
@@ -1,12 +1,12 @@
"use strict";
-const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", {});
-const {SessionWorker} = ChromeUtils.import("resource:///modules/sessionstore/SessionWorker.jsm", {});
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {SessionWorker} = ChromeUtils.import("resource:///modules/sessionstore/SessionWorker.jsm");
var Paths;
var SessionFile;
// We need a XULAppInfo to initialize SessionFile
ChromeUtils.import("resource://testing-common/AppInfo.jsm", this);
updateAppInfo({
name: "SessionRestoreTest",
diff --git browser/components/sessionstore/test/unit/test_shutdown_cleanup.js browser/components/sessionstore/test/unit/test_shutdown_cleanup.js
--- browser/components/sessionstore/test/unit/test_shutdown_cleanup.js
+++ browser/components/sessionstore/test/unit/test_shutdown_cleanup.js
@@ -2,21 +2,21 @@
/**
* This test ensures that we correctly clean up the session state before
* writing to disk a last time on shutdown. For now it only tests that each
* tab's shistory is capped to a maximum number of preceding and succeeding
* entries.
*/
-const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", {});
-const {SessionWorker} = ChromeUtils.import("resource:///modules/sessionstore/SessionWorker.jsm", {});
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {SessionWorker} = ChromeUtils.import("resource:///modules/sessionstore/SessionWorker.jsm");
const profd = do_get_profile();
-const {SessionFile} = ChromeUtils.import("resource:///modules/sessionstore/SessionFile.jsm", {});
+const {SessionFile} = ChromeUtils.import("resource:///modules/sessionstore/SessionFile.jsm");
const {Paths} = SessionFile;
const {File} = OS;
const MAX_ENTRIES = 9;
const URL = "http://example.com/#";
// We need a XULAppInfo to initialize SessionFile
diff --git browser/components/shell/HeadlessShell.jsm browser/components/shell/HeadlessShell.jsm
--- browser/components/shell/HeadlessShell.jsm
+++ browser/components/shell/HeadlessShell.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["HeadlessShell"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/osfile.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
// Refrences to the progress listeners to keep them from being gc'ed
// before they are called.
const progressListeners = new Map();
function loadContentWindow(webNavigation, uri, principal) {
return new Promise((resolve, reject) => {
webNavigation.loadURI(uri, Ci.nsIWebNavigation.LOAD_FLAGS_NONE, null, null, null, principal);
diff --git browser/components/shell/ShellService.jsm browser/components/shell/ShellService.jsm
--- browser/components/shell/ShellService.jsm
+++ browser/components/shell/ShellService.jsm
@@ -1,19 +1,19 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["ShellService"];
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "WindowsRegistry",
"resource://gre/modules/WindowsRegistry.jsm");
/**
* Internal functionality to save and restore the docShell.allow* properties.
*/
let ShellServiceInternal = {
/**
diff --git browser/components/shell/content/setDesktopBackground.js browser/components/shell/content/setDesktopBackground.js
--- browser/components/shell/content/setDesktopBackground.js
+++ browser/components/shell/content/setDesktopBackground.js
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var gSetBackground = {
_position: AppConstants.platform == "macosx" ? "STRETCH" : "",
_backgroundColor: AppConstants.platform != "macosx" ? 0 : undefined,
_screenWidth: 0,
_screenHeight: 0,
_image: null,
_canvas: null,
diff --git browser/components/shell/test/browser_633221.js browser/components/shell/test/browser_633221.js
--- browser/components/shell/test/browser_633221.js
+++ browser/components/shell/test/browser_633221.js
@@ -1,7 +1,7 @@
-ChromeUtils.import("resource:///modules/ShellService.jsm");
+const {ShellService} = ChromeUtils.import("resource:///modules/ShellService.jsm");
function test() {
ShellService.setDefaultBrowser(true, false);
ok(ShellService.isDefaultBrowser(true, false), "we got here and are the default browser");
ok(ShellService.isDefaultBrowser(true, true), "we got here and are the default browser");
}
diff --git browser/components/shell/test/test_headless_screenshot.html browser/components/shell/test/test_headless_screenshot.html
--- browser/components/shell/test/test_headless_screenshot.html
+++ browser/components/shell/test/test_headless_screenshot.html
@@ -4,19 +4,19 @@
https://bugzilla.mozilla.org/show_bug.cgi?id=1378010
-->
<head>
<meta charset="utf-8">
<title>Test for Bug 1378010</title>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
<script type="application/javascript">
- ChromeUtils.import("resource://gre/modules/Services.jsm");
- ChromeUtils.import("resource://gre/modules/Subprocess.jsm");
- ChromeUtils.import("resource://gre/modules/osfile.jsm");
+ const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+ const {Subprocess} = ChromeUtils.import("resource://gre/modules/Subprocess.jsm");
+ const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
SimpleTest.requestLongerTimeout(2);
const screenshotPath = OS.Path.join(OS.Constants.Path.tmpDir, "headless_test_screenshot.png");
async function runFirefox(args) {
const XRE_EXECUTABLE_FILE = "XREExeF";
const firefoxExe = Services.dirsvc.get(XRE_EXECUTABLE_FILE, Ci.nsIFile).path;
diff --git browser/components/syncedtabs/SyncedTabsDeckComponent.js browser/components/syncedtabs/SyncedTabsDeckComponent.js
--- browser/components/syncedtabs/SyncedTabsDeckComponent.js
+++ browser/components/syncedtabs/SyncedTabsDeckComponent.js
@@ -1,23 +1,23 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsDeckStore.js");
-ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsDeckView.js");
-ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsListStore.js");
-ChromeUtils.import("resource:///modules/syncedtabs/TabListComponent.js");
-ChromeUtils.import("resource:///modules/syncedtabs/TabListView.js");
-let { getChromeWindow } = ChromeUtils.import("resource:///modules/syncedtabs/util.js", {});
+const {SyncedTabsDeckStore} = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsDeckStore.js");
+const {SyncedTabsDeckView} = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsDeckView.js");
+const {SyncedTabsListStore} = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsListStore.js");
+const {TabListComponent} = ChromeUtils.import("resource:///modules/syncedtabs/TabListComponent.js");
+const {TabListView} = ChromeUtils.import("resource:///modules/syncedtabs/TabListView.js");
+let { getChromeWindow } = ChromeUtils.import("resource:///modules/syncedtabs/util.js");
XPCOMUtils.defineLazyGetter(this, "FxAccountsCommon", function() {
return ChromeUtils.import("resource://gre/modules/FxAccountsCommon.js", {});
});
let log = ChromeUtils.import("resource://gre/modules/Log.jsm", {})
.Log.repository.getLogger("Sync.RemoteTabs");
diff --git browser/components/syncedtabs/SyncedTabsDeckStore.js browser/components/syncedtabs/SyncedTabsDeckStore.js
--- browser/components/syncedtabs/SyncedTabsDeckStore.js
+++ browser/components/syncedtabs/SyncedTabsDeckStore.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-let { EventEmitter } = ChromeUtils.import("resource:///modules/syncedtabs/EventEmitter.jsm", {});
+let { EventEmitter } = ChromeUtils.import("resource:///modules/syncedtabs/EventEmitter.jsm");
var EXPORTED_SYMBOLS = [
"SyncedTabsDeckStore",
];
/**
* SyncedTabsDeckStore
*
diff --git browser/components/syncedtabs/SyncedTabsListStore.js browser/components/syncedtabs/SyncedTabsListStore.js
--- browser/components/syncedtabs/SyncedTabsListStore.js
+++ browser/components/syncedtabs/SyncedTabsListStore.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-let { EventEmitter } = ChromeUtils.import("resource:///modules/syncedtabs/EventEmitter.jsm", {});
+let { EventEmitter } = ChromeUtils.import("resource:///modules/syncedtabs/EventEmitter.jsm");
var EXPORTED_SYMBOLS = [
"SyncedTabsListStore",
];
/**
* SyncedTabsListStore
*
diff --git browser/components/syncedtabs/TabListComponent.js browser/components/syncedtabs/TabListComponent.js
--- browser/components/syncedtabs/TabListComponent.js
+++ browser/components/syncedtabs/TabListComponent.js
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
let log = ChromeUtils.import("resource://gre/modules/Log.jsm", {})
.Log.repository.getLogger("Sync.RemoteTabs");
XPCOMUtils.defineLazyModuleGetters(this, {
OpenInTabsUtils: "resource:///modules/OpenInTabsUtils.jsm",
});
diff --git browser/components/syncedtabs/TabListView.js browser/components/syncedtabs/TabListView.js
--- browser/components/syncedtabs/TabListView.js
+++ browser/components/syncedtabs/TabListView.js
@@ -1,20 +1,20 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
-let { getChromeWindow } = ChromeUtils.import("resource:///modules/syncedtabs/util.js", {});
+let { getChromeWindow } = ChromeUtils.import("resource:///modules/syncedtabs/util.js");
let log = ChromeUtils.import("resource://gre/modules/Log.jsm", {})
.Log.repository.getLogger("Sync.RemoteTabs");
var EXPORTED_SYMBOLS = [
"TabListView",
];
diff --git browser/components/syncedtabs/sidebar.js browser/components/syncedtabs/sidebar.js
--- browser/components/syncedtabs/sidebar.js
+++ browser/components/syncedtabs/sidebar.js
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://services-sync/SyncedTabs.jsm");
-ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsDeckComponent.js");
-ChromeUtils.import("resource:///actors/LightweightThemeChild.jsm");
+const {SyncedTabs} = ChromeUtils.import("resource://services-sync/SyncedTabs.jsm");
+const {SyncedTabsDeckComponent} = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsDeckComponent.js");
+const {LightweightThemeChild} = ChromeUtils.import("resource:///actors/LightweightThemeChild.jsm");
ChromeUtils.defineModuleGetter(this, "fxAccounts",
"resource://gre/modules/FxAccounts.jsm");
var syncedTabsDeckComponent = new SyncedTabsDeckComponent({window, SyncedTabs, fxAccounts});
let themeListener;
diff --git browser/components/syncedtabs/test/browser/head.js browser/components/syncedtabs/test/browser/head.js
--- browser/components/syncedtabs/test/browser/head.js
+++ browser/components/syncedtabs/test/browser/head.js
@@ -1,10 +1,10 @@
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Load mocking/stubbing library, sinon
// docs: http://sinonjs.org/docs/
/* global sinon */
Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js");
registerCleanupFunction(async function() {
diff --git browser/components/syncedtabs/test/xpcshell/head.js browser/components/syncedtabs/test/xpcshell/head.js
--- browser/components/syncedtabs/test/xpcshell/head.js
+++ browser/components/syncedtabs/test/xpcshell/head.js
@@ -1,16 +1,16 @@
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyGetter(this, "FxAccountsCommon", function() {
return ChromeUtils.import("resource://gre/modules/FxAccountsCommon.js", {});
});
do_get_profile(); // fxa needs a profile directory for storage.
// ================================================
// Load mocking/stubbing library, sinon
// docs: http://sinonjs.org/releases/v2.3.2/
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
+var {clearInterval, clearTimeout, setInterval, setIntervalWithTarget, setTimeout, setTimeoutWithTarget} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js", this);
/* globals sinon */
// ================================================
diff --git browser/components/syncedtabs/test/xpcshell/test_EventEmitter.js browser/components/syncedtabs/test/xpcshell/test_EventEmitter.js
--- browser/components/syncedtabs/test/xpcshell/test_EventEmitter.js
+++ browser/components/syncedtabs/test/xpcshell/test_EventEmitter.js
@@ -1,11 +1,11 @@
"use strict";
-let { EventEmitter } = ChromeUtils.import("resource:///modules/syncedtabs/EventEmitter.jsm", {});
+let { EventEmitter } = ChromeUtils.import("resource:///modules/syncedtabs/EventEmitter.jsm");
add_task(async function testSingleListener() {
let eventEmitter = new EventEmitter();
let spy = sinon.spy();
eventEmitter.on("click", spy);
eventEmitter.emit("click", "foo", "bar");
Assert.ok(spy.calledOnce);
diff --git browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckComponent.js browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckComponent.js
--- browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckComponent.js
+++ browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckComponent.js
@@ -1,16 +1,16 @@
"use strict";
-let { SyncedTabs } = ChromeUtils.import("resource://services-sync/SyncedTabs.jsm", {});
-let { SyncedTabsDeckComponent } = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsDeckComponent.js", {});
-let { TabListComponent } = ChromeUtils.import("resource:///modules/syncedtabs/TabListComponent.js", {});
-let { SyncedTabsListStore } = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsListStore.js", {});
-let { SyncedTabsDeckStore } = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsDeckStore.js", {});
-let { TabListView } = ChromeUtils.import("resource:///modules/syncedtabs/TabListView.js", {});
+let { SyncedTabs } = ChromeUtils.import("resource://services-sync/SyncedTabs.jsm");
+let { SyncedTabsDeckComponent } = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsDeckComponent.js");
+let { TabListComponent } = ChromeUtils.import("resource:///modules/syncedtabs/TabListComponent.js");
+let { SyncedTabsListStore } = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsListStore.js");
+let { SyncedTabsDeckStore } = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsDeckStore.js");
+let { TabListView } = ChromeUtils.import("resource:///modules/syncedtabs/TabListView.js");
add_task(async function testInitUninit() {
let deckStore = new SyncedTabsDeckStore();
let listComponent = {};
let mockWindow = {};
let ViewMock = sinon.stub();
diff --git browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckStore.js browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckStore.js
--- browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckStore.js
+++ browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckStore.js
@@ -1,11 +1,11 @@
"use strict";
-let { SyncedTabsDeckStore } = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsDeckStore.js", {});
+let { SyncedTabsDeckStore } = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsDeckStore.js");
add_task(async function testSelectUnkownPanel() {
let deckStore = new SyncedTabsDeckStore();
let spy = sinon.spy();
deckStore.on("change", spy);
deckStore.selectPanel("foo");
diff --git browser/components/syncedtabs/test/xpcshell/test_SyncedTabsListStore.js browser/components/syncedtabs/test/xpcshell/test_SyncedTabsListStore.js
--- browser/components/syncedtabs/test/xpcshell/test_SyncedTabsListStore.js
+++ browser/components/syncedtabs/test/xpcshell/test_SyncedTabsListStore.js
@@ -1,12 +1,12 @@
"use strict";
-let { SyncedTabs } = ChromeUtils.import("resource://services-sync/SyncedTabs.jsm", {});
-let { SyncedTabsListStore } = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsListStore.js", {});
+let { SyncedTabs } = ChromeUtils.import("resource://services-sync/SyncedTabs.jsm");
+let { SyncedTabsListStore } = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsListStore.js");
const FIXTURE = [
{
"id": "2xU5h-4bkWqA",
"type": "client",
"lastModified": 1492201200,
"name": "laptop",
"isMobile": false,
diff --git browser/components/syncedtabs/test/xpcshell/test_TabListComponent.js browser/components/syncedtabs/test/xpcshell/test_TabListComponent.js
--- browser/components/syncedtabs/test/xpcshell/test_TabListComponent.js
+++ browser/components/syncedtabs/test/xpcshell/test_TabListComponent.js
@@ -1,14 +1,14 @@
"use strict";
-let { SyncedTabs } = ChromeUtils.import("resource://services-sync/SyncedTabs.jsm", {});
-let { TabListComponent } = ChromeUtils.import("resource:///modules/syncedtabs/TabListComponent.js", {});
-let { SyncedTabsListStore } = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsListStore.js", {});
-let { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
+let { SyncedTabs } = ChromeUtils.import("resource://services-sync/SyncedTabs.jsm");
+let { TabListComponent } = ChromeUtils.import("resource:///modules/syncedtabs/TabListComponent.js");
+let { SyncedTabsListStore } = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsListStore.js");
+let { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const ACTION_METHODS = [
"onSelectRow",
"onOpenTab",
"onOpenTabs",
"onMoveSelectionDown",
"onMoveSelectionUp",
"onToggleBranch",
diff --git browser/components/tests/browser/browser_contentpermissionprompt.js browser/components/tests/browser/browser_contentpermissionprompt.js
--- browser/components/tests/browser/browser_contentpermissionprompt.js
+++ browser/components/tests/browser/browser_contentpermissionprompt.js
@@ -1,17 +1,17 @@
/**
* These tests test nsBrowserGlue's nsIContentPermissionPrompt
* implementation behaviour with various types of
* nsIContentPermissionRequests.
*/
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Integration.jsm", this);
XPCOMUtils.defineLazyServiceGetter(this, "ContentPermissionPrompt",
"@mozilla.org/content-permission/prompt;1",
"nsIContentPermissionPrompt");
/**
* This is a partial implementation of nsIContentPermissionType.
diff --git browser/components/tests/startupRecorder.js browser/components/tests/startupRecorder.js
--- browser/components/tests/startupRecorder.js
+++ browser/components/tests/startupRecorder.js
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const Cm = Components.manager;
Cm.QueryInterface(Ci.nsIServiceManager);
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
let firstPaintNotification = "widget-first-paint";
// widget-first-paint fires much later than expected on Linux.
if (AppConstants.platform == "linux")
firstPaintNotification = "xul-window-visible";
let win, canvas;
let paints = [];
diff --git browser/components/tests/unit/head.js browser/components/tests/unit/head.js
--- browser/components/tests/unit/head.js
+++ browser/components/tests/unit/head.js
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
// ================================================
// Load mocking/stubbing library, sinon
// docs: http://sinonjs.org/releases/v2.3.2/
/* exported sinon */
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
+var {clearInterval, clearTimeout, setInterval, setIntervalWithTarget, setTimeout, setTimeoutWithTarget} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js", this);
/* globals sinon */
// ================================================
var gProfD = do_get_profile().QueryInterface(Ci.nsIFile);
diff --git browser/components/tests/unit/test_browserGlue_pingcentre.js browser/components/tests/unit/test_browserGlue_pingcentre.js
--- browser/components/tests/unit/test_browserGlue_pingcentre.js
+++ browser/components/tests/unit/test_browserGlue_pingcentre.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource:///modules/PingCentre.jsm");
+const {PingCentre} = ChromeUtils.import("resource:///modules/PingCentre.jsm");
const TOPIC_SHIELD_INIT_COMPLETE = "shield-init-complete";
const SEND_PING_MOCK = sinon.stub(PingCentre.prototype, "sendPing");
let gBrowserGlue = Cc["@mozilla.org/browser/browserglue;1"]
.getService(Ci.nsIObserver);
add_task(async function() {
diff --git browser/components/tests/unit/test_distribution_cachedexistence.js browser/components/tests/unit/test_distribution_cachedexistence.js
--- browser/components/tests/unit/test_distribution_cachedexistence.js
+++ browser/components/tests/unit/test_distribution_cachedexistence.js
@@ -8,25 +8,25 @@
*/
const PREF_CACHED_FILE_EXISTENCE = "distribution.iniFile.exists.value";
const PREF_CACHED_FILE_APPVERSION = "distribution.iniFile.exists.appversion";
const PREF_LOAD_FROM_PROFILE = "distribution.testing.loadFromProfile";
const gTestDir = do_get_cwd();
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
add_task(async function() {
// Start with a clean slate of the prefs that control this feature.
Services.prefs.clearUserPref(PREF_CACHED_FILE_APPVERSION);
Services.prefs.clearUserPref(PREF_CACHED_FILE_EXISTENCE);
setupTest();
- let {DistributionCustomizer} = ChromeUtils.import("resource:///modules/distribution.js", {});
+ let {DistributionCustomizer} = ChromeUtils.import("resource:///modules/distribution.js");
let distribution = new DistributionCustomizer();
copyDistributionToProfile();
// Check that checking for distribution.ini returns the right value and sets up
// the cached prefs.
let exists = distribution._hasDistributionIni;
diff --git browser/components/translation/BingTranslator.jsm browser/components/translation/BingTranslator.jsm
--- browser/components/translation/BingTranslator.jsm
+++ browser/components/translation/BingTranslator.jsm
@@ -1,21 +1,21 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = [ "BingTranslator" ];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
-ChromeUtils.import("resource://services-common/async.js");
-ChromeUtils.import("resource://gre/modules/Http.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {PromiseUtils} = ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
+const {Async} = ChromeUtils.import("resource://services-common/async.js");
+const {httpRequest} = ChromeUtils.import("resource://gre/modules/Http.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["XMLHttpRequest"]);
// The maximum amount of net data allowed per request on Bing's API.
const MAX_REQUEST_DATA = 5000; // Documentation says 10000 but anywhere
// close to that is refused by the service.
// The maximum number of chunks allowed to be translated in a single
diff --git browser/components/translation/GoogleTranslator.jsm browser/components/translation/GoogleTranslator.jsm
--- browser/components/translation/GoogleTranslator.jsm
+++ browser/components/translation/GoogleTranslator.jsm
@@ -1,20 +1,20 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = [ "GoogleTranslator" ];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Http.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {PromiseUtils} = ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
+const {httpRequest} = ChromeUtils.import("resource://gre/modules/Http.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser"]);
// The maximum amount of net data allowed per request on Google's API.
const MAX_REQUEST_DATA = 5000; // XXX This is the Bing value
// The maximum number of chunks allowed to be translated in a single
// request.
const MAX_REQUEST_CHUNKS = 128; // Undocumented, but the de facto upper limit.
diff --git browser/components/translation/LanguageDetector.jsm browser/components/translation/LanguageDetector.jsm
--- browser/components/translation/LanguageDetector.jsm
+++ browser/components/translation/LanguageDetector.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["LanguageDetector"];
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
+const {clearTimeout, setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
// Since Emscripten can handle heap growth, but not heap shrinkage, we
// need to refresh the worker after we've processed a particularly large
// string in order to prevent unnecessary resident memory growth.
//
// These values define the cut-off string length and the idle timeout
// (in milliseconds) before destroying a worker. Once a string of the
// maximum size has been processed, the worker is marked for
diff --git browser/components/translation/Translation.jsm browser/components/translation/Translation.jsm
--- browser/components/translation/Translation.jsm
+++ browser/components/translation/Translation.jsm
@@ -7,17 +7,17 @@
var EXPORTED_SYMBOLS = [
"Translation",
"TranslationTelemetry",
];
const TRANSLATION_PREF_SHOWUI = "browser.translation.ui.show";
const TRANSLATION_PREF_DETECT_LANG = "browser.translation.detectLanguage";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var Translation = {
STATE_OFFER: 0,
STATE_TRANSLATING: 1,
STATE_TRANSLATED: 2,
STATE_ERROR: 3,
STATE_UNAVAILABLE: 4,
@@ -69,17 +69,17 @@ var Translation = {
trUI.showURLBarIcon();
if (trUI.shouldShowInfoBar(aBrowser.currentURI))
trUI.showTranslationInfoBar();
},
openProviderAttribution() {
let attribution = this.supportedEngines[this.translationEngine];
- ChromeUtils.import("resource:///modules/BrowserWindowTracker.jsm");
+ const {BrowserWindowTracker} = ChromeUtils.import("resource:///modules/BrowserWindowTracker.jsm");
BrowserWindowTracker.getTopWindow().openWebLinkIn(attribution, "tab");
},
/**
* The list of translation engines and their attributions.
*/
supportedEngines: {
"Google": "",
diff --git browser/components/translation/TranslationContentHandler.jsm browser/components/translation/TranslationContentHandler.jsm
--- browser/components/translation/TranslationContentHandler.jsm
+++ browser/components/translation/TranslationContentHandler.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = [ "TranslationContentHandler" ];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "LanguageDetector",
"resource:///modules/translation/LanguageDetector.jsm");
const STATE_OFFER = 0;
const STATE_TRANSLATED = 2;
const STATE_ERROR = 3;
var TranslationContentHandler = function(global, docShell) {
@@ -110,17 +110,17 @@ TranslationContentHandler.prototype = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference]),
receiveMessage(msg) {
switch (msg.name) {
case "Translation:TranslateDocument":
{
- ChromeUtils.import("resource:///modules/translation/TranslationDocument.jsm");
+ var {TranslationDocument} = ChromeUtils.import("resource:///modules/translation/TranslationDocument.jsm");
// If a TranslationDocument already exists for this document, it should
// be used instead of creating a new one so that we can use the original
// content of the page for the new translation instead of the newly
// translated text.
let translationDocument = this.global.content.translationDocument ||
new TranslationDocument(this.global.content.document);
diff --git browser/components/translation/TranslationDocument.jsm browser/components/translation/TranslationDocument.jsm
--- browser/components/translation/TranslationDocument.jsm
+++ browser/components/translation/TranslationDocument.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = [ "TranslationDocument" ];
-ChromeUtils.import("resource://services-common/async.js");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Async} = ChromeUtils.import("resource://services-common/async.js");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser"]);
/**
* This class represents a document that is being translated,
* and it is responsible for parsing the document,
* generating the data structures translation (the list of
* translation items and roots), and managing the original
* and translated texts on the translation items.
diff --git browser/components/translation/YandexTranslator.jsm browser/components/translation/YandexTranslator.jsm
--- browser/components/translation/YandexTranslator.jsm
+++ browser/components/translation/YandexTranslator.jsm
@@ -1,21 +1,21 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = [ "YandexTranslator" ];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
-ChromeUtils.import("resource://services-common/async.js");
-ChromeUtils.import("resource://gre/modules/Http.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {PromiseUtils} = ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
+const {Async} = ChromeUtils.import("resource://services-common/async.js");
+const {httpRequest} = ChromeUtils.import("resource://gre/modules/Http.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["XMLHttpRequest"]);
// The maximum amount of net data allowed per request on Bing's API.
const MAX_REQUEST_DATA = 5000; // Documentation says 10000 but anywhere
// close to that is refused by the service.
// The maximum number of chunks allowed to be translated in a single
diff --git browser/components/translation/test/browser_translation_bing.js browser/components/translation/test/browser_translation_bing.js
--- browser/components/translation/test/browser_translation_bing.js
+++ browser/components/translation/test/browser_translation_bing.js
@@ -4,18 +4,18 @@
// Test the Bing Translator client against a mock Bing service, bing.sjs.
"use strict";
const kClientIdPref = "browser.translation.bing.clientIdOverride";
const kClientSecretPref = "browser.translation.bing.apiKeyOverride";
-const {BingTranslator} = ChromeUtils.import("resource:///modules/translation/BingTranslator.jsm", {});
-const {TranslationDocument} = ChromeUtils.import("resource:///modules/translation/TranslationDocument.jsm", {});
+const {BingTranslator} = ChromeUtils.import("resource:///modules/translation/BingTranslator.jsm");
+const {TranslationDocument} = ChromeUtils.import("resource:///modules/translation/TranslationDocument.jsm");
add_task(async function setup() {
Services.prefs.setCharPref(kClientIdPref, "testClient");
Services.prefs.setCharPref(kClientSecretPref, "testSecret");
registerCleanupFunction(function() {
Services.prefs.clearUserPref(kClientIdPref);
Services.prefs.clearUserPref(kClientSecretPref);
@@ -34,18 +34,18 @@ add_task(async function test_bing_transl
let url = constructFixtureURL("bug1022725-fr.html");
let tab = await promiseTestPageLoad(url);
// Translating the contents of the loaded tab.
gBrowser.selectedTab = tab;
let browser = tab.linkedBrowser;
await ContentTask.spawn(browser, null, async function() {
- ChromeUtils.import("resource:///modules/translation/BingTranslator.jsm");
- ChromeUtils.import("resource:///modules/translation/TranslationDocument.jsm");
+ const {BingTranslator} = ChromeUtils.import("resource:///modules/translation/BingTranslator.jsm");
+ const {TranslationDocument} = ChromeUtils.import("resource:///modules/translation/TranslationDocument.jsm");
let client = new BingTranslator(
new TranslationDocument(content.document), "fr", "en");
let result = await client.translate();
// XXXmikedeboer; here you would continue the test/ content inspection.
Assert.ok(result, "There should be a result");
});
@@ -69,18 +69,18 @@ add_task(async function test_handling_ou
let url = constructFixtureURL("bug1022725-fr.html");
let tab = await promiseTestPageLoad(url);
// Translating the contents of the loaded tab.
gBrowser.selectedTab = tab;
let browser = tab.linkedBrowser;
await ContentTask.spawn(browser, null, async function() {
- ChromeUtils.import("resource:///modules/translation/BingTranslator.jsm");
- ChromeUtils.import("resource:///modules/translation/TranslationDocument.jsm");
+ const {BingTranslator} = ChromeUtils.import("resource:///modules/translation/BingTranslator.jsm");
+ const {TranslationDocument} = ChromeUtils.import("resource:///modules/translation/TranslationDocument.jsm");
let client = new BingTranslator(
new TranslationDocument(content.document), "fr", "en");
client._resetToken();
try {
await client.translate();
} catch (ex) {
// It is alright that the translation fails.
diff --git browser/components/translation/test/browser_translation_yandex.js browser/components/translation/test/browser_translation_yandex.js
--- browser/components/translation/test/browser_translation_yandex.js
+++ browser/components/translation/test/browser_translation_yandex.js
@@ -13,17 +13,17 @@
// should use "expectUncaughtRejection" to flag individual failures.
ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
PromiseTestUtils.whitelistRejectionsGlobally(/NS_ERROR_ILLEGAL_VALUE/);
const kEnginePref = "browser.translation.engine";
const kApiKeyPref = "browser.translation.yandex.apiKeyOverride";
const kShowUIPref = "browser.translation.ui.show";
-const {Translation} = ChromeUtils.import("resource:///modules/translation/Translation.jsm", {});
+const {Translation} = ChromeUtils.import("resource:///modules/translation/Translation.jsm");
add_task(async function setup() {
Services.prefs.setCharPref(kEnginePref, "Yandex");
Services.prefs.setCharPref(kApiKeyPref, "yandexValidKey");
Services.prefs.setBoolPref(kShowUIPref, true);
registerCleanupFunction(function() {
Services.prefs.clearUserPref(kEnginePref);
@@ -42,18 +42,18 @@ add_task(async function test_yandex_tran
let url = constructFixtureURL("bug1022725-fr.html");
let tab = await promiseTestPageLoad(url);
// Translating the contents of the loaded tab.
gBrowser.selectedTab = tab;
let browser = tab.linkedBrowser;
await ContentTask.spawn(browser, null, async function() {
- ChromeUtils.import("resource:///modules/translation/TranslationDocument.jsm");
- ChromeUtils.import("resource:///modules/translation/YandexTranslator.jsm");
+ const {TranslationDocument} = ChromeUtils.import("resource:///modules/translation/TranslationDocument.jsm");
+ const {YandexTranslator} = ChromeUtils.import("resource:///modules/translation/YandexTranslator.jsm");
let client = new YandexTranslator(
new TranslationDocument(content.document), "fr", "en");
let result = await client.translate();
Assert.ok(result, "There should be a result.");
});
diff --git browser/components/translation/test/unit/test_cld2.js browser/components/translation/test/unit/test_cld2.js
--- browser/components/translation/test/unit/test_cld2.js
+++ browser/components/translation/test/unit/test_cld2.js
@@ -368,18 +368,18 @@ const kTestPairs = [
// Simple intermixed French/English text
["fr", "FRENCH", kTeststr_fr_en_Latn, [false, 80, "en", 32]],
// Cross-check the main quadgram table build date
// Change the expected language each time it is rebuilt
["az", "AZERBAIJANI", kTeststr_version], // 2014.01.31
];
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
-let detectorModule = ChromeUtils.import("resource:///modules/translation/LanguageDetector.jsm", {});
+const {setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
+let detectorModule = ChromeUtils.import("resource:///modules/translation/LanguageDetector.jsm", null);
const LanguageDetector = detectorModule.LanguageDetector;
function check_result(result, langCode, expected) {
equal(result.language, langCode, "Expected language code");
// Round percentage up to the nearest 5%, since most strings are
// detected at slightly less than 100%, and we don't want to
// encode each exact value.
diff --git browser/components/uitour/UITour.jsm browser/components/uitour/UITour.jsm
--- browser/components/uitour/UITour.jsm
+++ browser/components/uitour/UITour.jsm
@@ -1,20 +1,20 @@
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
"use strict";
var EXPORTED_SYMBOLS = ["UITour"];
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/TelemetryController.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {TelemetryController} = ChromeUtils.import("resource://gre/modules/TelemetryController.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
ChromeUtils.defineModuleGetter(this, "CustomizableUI",
"resource:///modules/CustomizableUI.jsm");
ChromeUtils.defineModuleGetter(this, "FxAccounts",
"resource://gre/modules/FxAccounts.jsm");
ChromeUtils.defineModuleGetter(this, "LightweightThemeManager",
diff --git browser/components/uitour/UITourChild.jsm browser/components/uitour/UITourChild.jsm
--- browser/components/uitour/UITourChild.jsm
+++ browser/components/uitour/UITourChild.jsm
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var EXPORTED_SYMBOLS = ["UITourChild"];
-ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const PREF_TEST_WHITELIST = "browser.uitour.testingOrigins";
const UITOUR_PERMISSION = "uitour";
class UITourChild extends ActorChild {
handleEvent(event) {
if (!Services.prefs.getBoolPref("browser.uitour.enabled")) {
return;
diff --git browser/components/uitour/test/browser_contentBlocking.js browser/components/uitour/test/browser_contentBlocking.js
--- browser/components/uitour/test/browser_contentBlocking.js
+++ browser/components/uitour/test/browser_contentBlocking.js
@@ -2,17 +2,17 @@
const PREF_INTRO_COUNT = "browser.contentblocking.introCount";
const PREF_TP_ENABLED = "privacy.trackingprotection.enabled";
const BENIGN_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/benignPage.html";
const TRACKING_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
const TOOLTIP_PANEL = document.getElementById("UITourTooltip");
const TOOLTIP_ANCHOR = document.getElementById("tracking-protection-icon-animatable-box");
-var {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
+var {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm");
registerCleanupFunction(function() {
UrlClassifierTestUtils.cleanupTestTrackers();
Services.prefs.clearUserPref(PREF_TP_ENABLED);
Services.prefs.clearUserPref(PREF_INTRO_COUNT);
});
function allowOneIntro() {
diff --git browser/components/uitour/test/browser_fxa.js browser/components/uitour/test/browser_fxa.js
--- browser/components/uitour/test/browser_fxa.js
+++ browser/components/uitour/test/browser_fxa.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-ChromeUtils.import("resource://services-sync/UIState.jsm");
+const {UIState} = ChromeUtils.import("resource://services-sync/UIState.jsm");
ChromeUtils.defineModuleGetter(this, "fxAccounts",
"resource://gre/modules/FxAccounts.jsm");
var gTestTab;
var gContentAPI;
var gContentWindow;
diff --git browser/components/uitour/test/browser_trackingProtection.js browser/components/uitour/test/browser_trackingProtection.js
--- browser/components/uitour/test/browser_trackingProtection.js
+++ browser/components/uitour/test/browser_trackingProtection.js
@@ -2,17 +2,17 @@
const PREF_INTRO_COUNT = "browser.contentblocking.introCount";
const PREF_TP_ENABLED = "privacy.trackingprotection.enabled";
const BENIGN_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/benignPage.html";
const TRACKING_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
const TOOLTIP_PANEL = document.getElementById("UITourTooltip");
const TOOLTIP_ANCHOR = document.getElementById("tracking-protection-icon-animatable-box");
-var {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
+var {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm");
registerCleanupFunction(function() {
UrlClassifierTestUtils.cleanupTestTrackers();
Services.prefs.clearUserPref(PREF_TP_ENABLED);
});
function allowOneIntro() {
Services.prefs.setIntPref(PREF_INTRO_COUNT, window.ContentBlocking.MAX_INTROS - 1);
diff --git browser/components/uitour/test/browser_trackingProtection_tour.js browser/components/uitour/test/browser_trackingProtection_tour.js
--- browser/components/uitour/test/browser_trackingProtection_tour.js
+++ browser/components/uitour/test/browser_trackingProtection_tour.js
@@ -1,15 +1,15 @@
"use strict";
var gTestTab;
var gContentAPI;
var gContentWindow;
-const { UrlClassifierTestUtils } = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
+const { UrlClassifierTestUtils } = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm");
const TP_ENABLED_PREF = "privacy.trackingprotection.enabled";
add_task(setup_UITourTest);
add_task(async function test_setup() {
Services.prefs.setBoolPref("privacy.trackingprotection.enabled", true);
await UrlClassifierTestUtils.addTestTrackers();
diff --git browser/components/urlbar/UrlbarController.jsm browser/components/urlbar/UrlbarController.jsm
--- browser/components/urlbar/UrlbarController.jsm
+++ browser/components/urlbar/UrlbarController.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["QueryContext", "UrlbarController"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.jsm",
// BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm",
});
const TELEMETRY_1ST_RESULT = "PLACES_AUTOCOMPLETE_1ST_RESULT_TIME_MS";
diff --git browser/components/urlbar/UrlbarInput.jsm browser/components/urlbar/UrlbarInput.jsm
--- browser/components/urlbar/UrlbarInput.jsm
+++ browser/components/urlbar/UrlbarInput.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["UrlbarInput"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
QueryContext: "resource:///modules/UrlbarUtils.jsm",
Services: "resource://gre/modules/Services.jsm",
UrlbarController: "resource:///modules/UrlbarController.jsm",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
diff --git browser/components/urlbar/UrlbarMatch.jsm browser/components/urlbar/UrlbarMatch.jsm
--- browser/components/urlbar/UrlbarMatch.jsm
+++ browser/components/urlbar/UrlbarMatch.jsm
@@ -9,17 +9,17 @@
* A match is a single search result found by a provider, that can be passed
* from the model to the view, through the controller. It is mainly defined by
* a type of the match, and a payload, containing the data. A few getters allow
* to retrieve information common to all the match types.
*/
var EXPORTED_SYMBOLS = ["UrlbarMatch"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
});
/**
* Class used to create a match.
*/
class UrlbarMatch {
diff --git browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm
--- browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm
+++ browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm
@@ -5,17 +5,17 @@
"use strict";
/**
* This module exports a component used to sort matches in a QueryContext.
*/
var EXPORTED_SYMBOLS = ["UrlbarMuxerUnifiedComplete"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
Log: "resource://gre/modules/Log.jsm",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
UrlbarMuxer: "resource:///modules/UrlbarUtils.jsm",
UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
});
XPCOMUtils.defineLazyGetter(this, "logger", () =>
diff --git browser/components/urlbar/UrlbarPrefs.jsm browser/components/urlbar/UrlbarPrefs.jsm
--- browser/components/urlbar/UrlbarPrefs.jsm
+++ browser/components/urlbar/UrlbarPrefs.jsm
@@ -6,18 +6,18 @@
/**
* This module exports the UrlbarPrefs singleton, which manages
* preferences for the urlbar.
*/
var EXPORTED_SYMBOLS = ["UrlbarPrefs"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
});
const PREF_URLBAR_BRANCH = "browser.urlbar.";
diff --git browser/components/urlbar/UrlbarProviderOpenTabs.jsm browser/components/urlbar/UrlbarProviderOpenTabs.jsm
--- browser/components/urlbar/UrlbarProviderOpenTabs.jsm
+++ browser/components/urlbar/UrlbarProviderOpenTabs.jsm
@@ -6,17 +6,17 @@
/**
* This module exports a provider, returning open tabs matches for the urlbar.
* It is also used to register and unregister open tabs.
*/
var EXPORTED_SYMBOLS = ["UrlbarProviderOpenTabs"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
Log: "resource://gre/modules/Log.jsm",
PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
UrlbarMatch: "resource:///modules/UrlbarMatch.jsm",
UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm",
UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
});
diff --git browser/components/urlbar/UrlbarProviderUnifiedComplete.jsm browser/components/urlbar/UrlbarProviderUnifiedComplete.jsm
--- browser/components/urlbar/UrlbarProviderUnifiedComplete.jsm
+++ browser/components/urlbar/UrlbarProviderUnifiedComplete.jsm
@@ -7,17 +7,17 @@
/**
* This module exports a provider that wraps the existing UnifiedComplete
* component, it is supposed to be used as an interim solution while we rewrite
* the model providers in a more modular way.
*/
var EXPORTED_SYMBOLS = ["UrlbarProviderUnifiedComplete"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
Log: "resource://gre/modules/Log.jsm",
PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
UrlbarMatch: "resource:///modules/UrlbarMatch.jsm",
UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
});
diff --git browser/components/urlbar/UrlbarProvidersManager.jsm browser/components/urlbar/UrlbarProvidersManager.jsm
--- browser/components/urlbar/UrlbarProvidersManager.jsm
+++ browser/components/urlbar/UrlbarProvidersManager.jsm
@@ -6,17 +6,17 @@
/**
* This module exports a component used to register search providers and manage
* the connection between such providers and a UrlbarController.
*/
var EXPORTED_SYMBOLS = ["UrlbarProvidersManager"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
Log: "resource://gre/modules/Log.jsm",
PlacesUtils: "resource://modules/PlacesUtils.jsm",
UrlbarMuxer: "resource:///modules/UrlbarUtils.jsm",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm",
UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
diff --git browser/components/urlbar/UrlbarTokenizer.jsm browser/components/urlbar/UrlbarTokenizer.jsm
--- browser/components/urlbar/UrlbarTokenizer.jsm
+++ browser/components/urlbar/UrlbarTokenizer.jsm
@@ -7,18 +7,18 @@
/**
* This module exports a tokenizer to be used by the urlbar model.
* Emitted tokens are objects in the shape { type, value }, where type is one
* of UrlbarTokenizer.TYPE.
*/
var EXPORTED_SYMBOLS = ["UrlbarTokenizer"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "Log",
"resource://gre/modules/Log.jsm");
XPCOMUtils.defineLazyGetter(this, "logger", () =>
Log.repository.getLogger("Places.Urlbar.Tokenizer"));
var UrlbarTokenizer = {
// Regex matching on whitespaces.
diff --git browser/components/urlbar/UrlbarUtils.jsm browser/components/urlbar/UrlbarUtils.jsm
--- browser/components/urlbar/UrlbarUtils.jsm
+++ browser/components/urlbar/UrlbarUtils.jsm
@@ -11,17 +11,17 @@
var EXPORTED_SYMBOLS = [
"QueryContext",
"UrlbarMuxer",
"UrlbarProvider",
"UrlbarUtils",
];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
BinarySearch: "resource://gre/modules/BinarySearch.jsm",
BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
PlacesUIUtils: "resource:///modules/PlacesUIUtils.jsm",
PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
Services: "resource://gre/modules/Services.jsm",
diff --git browser/components/urlbar/UrlbarValueFormatter.jsm browser/components/urlbar/UrlbarValueFormatter.jsm
--- browser/components/urlbar/UrlbarValueFormatter.jsm
+++ browser/components/urlbar/UrlbarValueFormatter.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["UrlbarValueFormatter"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.jsm",
Services: "resource://gre/modules/Services.jsm",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
});
/**
diff --git browser/components/urlbar/UrlbarView.jsm browser/components/urlbar/UrlbarView.jsm
--- browser/components/urlbar/UrlbarView.jsm
+++ browser/components/urlbar/UrlbarView.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["UrlbarView"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
});
/**
* Receives and displays address bar autocomplete results.
*/
class UrlbarView {
diff --git browser/components/urlbar/tests/browser/head.js browser/components/urlbar/tests/browser/head.js
--- browser/components/urlbar/tests/browser/head.js
+++ browser/components/urlbar/tests/browser/head.js
@@ -4,17 +4,17 @@
/**
* These tests unit test the result/url loading functionality of UrlbarController.
*/
"use strict";
let sandbox;
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
Services: "resource://gre/modules/Services.jsm",
QueryContext: "resource:///modules/UrlbarUtils.jsm",
UrlbarController: "resource:///modules/UrlbarController.jsm",
UrlbarMatch: "resource:///modules/UrlbarMatch.jsm",
UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
});
diff --git browser/components/urlbar/tests/unit/head.js browser/components/urlbar/tests/unit/head.js
--- browser/components/urlbar/tests/unit/head.js
+++ browser/components/urlbar/tests/unit/head.js
@@ -1,23 +1,23 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Import common head.
/* import-globals-from ../../../../../toolkit/components/places/tests/head_common.js */
var commonFile = do_get_file("../../../../../toolkit/components/places/tests/head_common.js", false);
if (commonFile) {
let uri = Services.io.newFileURI(commonFile);
Services.scriptloader.loadSubScript(uri.spec, this);
}
// Put any other stuff relative to this test folder below.
-ChromeUtils.import("resource:///modules/UrlbarUtils.jsm");
+var {QueryContext, UrlbarMuxer, UrlbarProvider, UrlbarUtils} = ChromeUtils.import("resource:///modules/UrlbarUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
HttpServer: "resource://testing-common/httpd.js",
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.jsm",
PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
UrlbarController: "resource:///modules/UrlbarController.jsm",
UrlbarInput: "resource:///modules/UrlbarInput.jsm",
UrlbarMatch: "resource:///modules/UrlbarMatch.jsm",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
@@ -25,17 +25,17 @@ XPCOMUtils.defineLazyModuleGetters(this,
UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm",
UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm",
});
// ================================================
// Load mocking/stubbing library, sinon
// docs: http://sinonjs.org/releases/v2.3.2/
// Sinon needs Timer.jsm for setTimeout etc.
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
+var {clearInterval, clearTimeout, setInterval, setIntervalWithTarget, setTimeout, setTimeoutWithTarget} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js", this);
/* globals sinon */
// ================================================
/**
* @param {string} searchString The search string to insert into the context.
* @param {object} properties Overrides for the default values.
* @returns {QueryContext} Creates a dummy query context with pre-filled required options.
diff --git browser/components/urlbar/tests/unit/test_UrlbarController_integration.js browser/components/urlbar/tests/unit/test_UrlbarController_integration.js
--- browser/components/urlbar/tests/unit/test_UrlbarController_integration.js
+++ browser/components/urlbar/tests/unit/test_UrlbarController_integration.js
@@ -2,17 +2,17 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
/**
* These tests test the UrlbarController in association with the model.
*/
"use strict";
-ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
+const {PromiseUtils} = ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
const TEST_URL = "http://example.com";
const match = new UrlbarMatch(UrlbarUtils.MATCH_TYPE.TAB_SWITCH,
UrlbarUtils.MATCH_SOURCE.TABS,
{ url: TEST_URL });
let controller;
/**
diff --git browser/components/urlbar/tests/unit/test_UrlbarUtils_addToUrlbarHistory.js browser/components/urlbar/tests/unit/test_UrlbarUtils_addToUrlbarHistory.js
--- browser/components/urlbar/tests/unit/test_UrlbarUtils_addToUrlbarHistory.js
+++ browser/components/urlbar/tests/unit/test_UrlbarUtils_addToUrlbarHistory.js
@@ -3,18 +3,18 @@
/**
* These tests unit test the functionality of the functions in UrlbarUtils.
* Some functions are bigger, and split out into sepearate test_UrlbarUtils_* files.
*/
"use strict";
-ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
-ChromeUtils.import("resource:///modules/PlacesUIUtils.jsm");
+const {PrivateBrowsingUtils} = ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
+const {PlacesUIUtils} = ChromeUtils.import("resource:///modules/PlacesUIUtils.jsm");
let sandbox;
add_task(function setup() {
sandbox = sinon.sandbox.create();
});
add_task(function test_addToUrlbarHistory() {
diff --git browser/extensions/formautofill/FormAutofill.jsm browser/extensions/formautofill/FormAutofill.jsm
--- browser/extensions/formautofill/FormAutofill.jsm
+++ browser/extensions/formautofill/FormAutofill.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["FormAutofill"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const ADDRESSES_FIRST_TIME_USE_PREF = "extensions.formautofill.firstTimeUse";
const AUTOFILL_CREDITCARDS_AVAILABLE_PREF = "extensions.formautofill.creditCards.available";
const CREDITCARDS_USED_STATUS_PREF = "extensions.formautofill.creditCards.used";
const DEFAULT_REGION_PREF = "browser.search.region";
const ENABLED_AUTOFILL_ADDRESSES_PREF = "extensions.formautofill.addresses.enabled";
const ENABLED_AUTOFILL_CREDITCARDS_PREF = "extensions.formautofill.creditCards.enabled";
const SUPPORTED_COUNTRIES_PREF = "extensions.formautofill.supportedCountries";
diff --git browser/extensions/formautofill/FormAutofillContent.jsm browser/extensions/formautofill/FormAutofillContent.jsm
--- browser/extensions/formautofill/FormAutofillContent.jsm
+++ browser/extensions/formautofill/FormAutofillContent.jsm
@@ -9,18 +9,18 @@
/* eslint-disable no-use-before-define */
"use strict";
var EXPORTED_SYMBOLS = ["FormAutofillContent"];
const Cm = Components.manager;
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "AddressResult",
"resource://formautofill/ProfileAutoCompleteResult.jsm");
ChromeUtils.defineModuleGetter(this, "CreditCardResult",
"resource://formautofill/ProfileAutoCompleteResult.jsm");
ChromeUtils.defineModuleGetter(this, "FormAutofill",
"resource://formautofill/FormAutofill.jsm");
ChromeUtils.defineModuleGetter(this, "FormAutofillHandler",
diff --git browser/extensions/formautofill/FormAutofillDoorhanger.jsm browser/extensions/formautofill/FormAutofillDoorhanger.jsm
--- browser/extensions/formautofill/FormAutofillDoorhanger.jsm
+++ browser/extensions/formautofill/FormAutofillDoorhanger.jsm
@@ -6,20 +6,20 @@
* Implements doorhanger singleton that wraps up the PopupNotifications and handles
* the doorhager UI for formautofill related features.
*/
"use strict";
var EXPORTED_SYMBOLS = ["FormAutofillDoorhanger"];
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
-ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {FormAutofill} = ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
+const {FormAutofillUtils} = ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
this.log = null;
FormAutofill.defineLazyLogGetter(this, EXPORTED_SYMBOLS[0]);
const GetStringFromName = FormAutofillUtils.stringBundle.GetStringFromName;
const formatStringFromName = FormAutofillUtils.stringBundle.formatStringFromName;
const brandShortName = FormAutofillUtils.brandBundle.GetStringFromName("brandShortName");
let changeAutofillOptsKey = "changeAutofillOptions";
diff --git browser/extensions/formautofill/FormAutofillHandler.jsm browser/extensions/formautofill/FormAutofillHandler.jsm
--- browser/extensions/formautofill/FormAutofillHandler.jsm
+++ browser/extensions/formautofill/FormAutofillHandler.jsm
@@ -5,20 +5,20 @@
/*
* Defines a handler object to represent forms that autofill can handle.
*/
"use strict";
var EXPORTED_SYMBOLS = ["FormAutofillHandler"];
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {FormAutofill} = ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
ChromeUtils.defineModuleGetter(this, "FormAutofillUtils",
"resource://formautofill/FormAutofillUtils.jsm");
ChromeUtils.defineModuleGetter(this, "FormAutofillHeuristics",
"resource://formautofill/FormAutofillHeuristics.jsm");
ChromeUtils.defineModuleGetter(this, "FormLikeFactory",
"resource://gre/modules/FormLikeFactory.jsm");
diff --git browser/extensions/formautofill/FormAutofillHeuristics.jsm browser/extensions/formautofill/FormAutofillHeuristics.jsm
--- browser/extensions/formautofill/FormAutofillHeuristics.jsm
+++ browser/extensions/formautofill/FormAutofillHeuristics.jsm
@@ -5,19 +5,19 @@
/*
* Form Autofill field heuristics.
*/
"use strict";
var EXPORTED_SYMBOLS = ["FormAutofillHeuristics", "LabelUtils"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {FormAutofill} = ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
ChromeUtils.defineModuleGetter(this, "FormAutofillUtils",
"resource://formautofill/FormAutofillUtils.jsm");
this.log = null;
FormAutofill.defineLazyLogGetter(this, EXPORTED_SYMBOLS[0]);
const PREF_HEURISTICS_ENABLED = "extensions.formautofill.heuristics.enabled";
const PREF_SECTION_ENABLED = "extensions.formautofill.section.enabled";
diff --git browser/extensions/formautofill/FormAutofillParent.jsm browser/extensions/formautofill/FormAutofillParent.jsm
--- browser/extensions/formautofill/FormAutofillParent.jsm
+++ browser/extensions/formautofill/FormAutofillParent.jsm
@@ -26,20 +26,20 @@
*/
"use strict";
// We expose a singleton from this module. Some tests may import the
// constructor via a backstage pass.
var EXPORTED_SYMBOLS = ["formAutofillParent"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
+const {FormAutofill} = ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
CreditCard: "resource://gre/modules/CreditCard.jsm",
FormAutofillPreferences: "resource://formautofill/FormAutofillPreferences.jsm",
FormAutofillDoorhanger: "resource://formautofill/FormAutofillDoorhanger.jsm",
FormAutofillUtils: "resource://formautofill/FormAutofillUtils.jsm",
OSKeyStore: "resource://formautofill/OSKeyStore.jsm",
@@ -57,17 +57,17 @@ const {
ADDRESSES_COLLECTION_NAME,
CREDITCARDS_COLLECTION_NAME,
} = FormAutofillUtils;
function FormAutofillParent() {
// Lazily load the storage JSM to avoid disk I/O until absolutely needed.
// Once storage is loaded we need to update saved field names and inform content processes.
XPCOMUtils.defineLazyGetter(this, "formAutofillStorage", () => {
- let {formAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", {});
+ let {formAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm");
log.debug("Loading formAutofillStorage");
formAutofillStorage.initialize().then(() => {
// Update the saved field names to compute the status and update child processes.
this._updateSavedFieldNames();
});
return formAutofillStorage;
diff --git browser/extensions/formautofill/FormAutofillPreferences.jsm browser/extensions/formautofill/FormAutofillPreferences.jsm
--- browser/extensions/formautofill/FormAutofillPreferences.jsm
+++ browser/extensions/formautofill/FormAutofillPreferences.jsm
@@ -11,19 +11,19 @@
var EXPORTED_SYMBOLS = ["FormAutofillPreferences"];
// Add addresses enabled flag in telemetry environment for recording the number of
// users who disable/enable the address autofill feature.
const BUNDLE_URI = "chrome://formautofill/locale/formautofill.properties";
const MANAGE_ADDRESSES_URL = "chrome://formautofill/content/manageAddresses.xhtml";
const MANAGE_CREDITCARDS_URL = "chrome://formautofill/content/manageCreditCards.xhtml";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
-ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {FormAutofill} = ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
+const {FormAutofillUtils} = ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
const {
ENABLED_AUTOFILL_ADDRESSES_PREF,
ENABLED_AUTOFILL_CREDITCARDS_PREF,
} = FormAutofill;
const {
MANAGE_ADDRESSES_KEYWORDS,
EDIT_ADDRESS_KEYWORDS,
diff --git browser/extensions/formautofill/FormAutofillStorage.jsm browser/extensions/formautofill/FormAutofillStorage.jsm
--- browser/extensions/formautofill/FormAutofillStorage.jsm
+++ browser/extensions/formautofill/FormAutofillStorage.jsm
@@ -123,21 +123,21 @@
*/
"use strict";
// We expose a singleton from this module. Some tests may import the
// constructor via a backstage pass.
this.EXPORTED_SYMBOLS = ["formAutofillStorage"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/osfile.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
-ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
+const {FormAutofill} = ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
ChromeUtils.defineModuleGetter(this, "CreditCard",
"resource://gre/modules/CreditCard.jsm");
ChromeUtils.defineModuleGetter(this, "JSONFile",
"resource://gre/modules/JSONFile.jsm");
ChromeUtils.defineModuleGetter(this, "FormAutofillNameUtils",
"resource://formautofill/FormAutofillNameUtils.jsm");
ChromeUtils.defineModuleGetter(this, "FormAutofillUtils",
diff --git browser/extensions/formautofill/FormAutofillSync.jsm browser/extensions/formautofill/FormAutofillSync.jsm
--- browser/extensions/formautofill/FormAutofillSync.jsm
+++ browser/extensions/formautofill/FormAutofillSync.jsm
@@ -1,21 +1,21 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["AddressesEngine", "CreditCardsEngine"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://services-sync/engines.js");
-ChromeUtils.import("resource://services-sync/record.js");
-ChromeUtils.import("resource://services-sync/util.js");
-ChromeUtils.import("resource://services-sync/constants.js");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Changeset, Store, SyncEngine, Tracker} = ChromeUtils.import("resource://services-sync/engines.js");
+const {CryptoWrapper} = ChromeUtils.import("resource://services-sync/record.js");
+const {Utils} = ChromeUtils.import("resource://services-sync/util.js");
+const {SCORE_INCREMENT_XLARGE} = ChromeUtils.import("resource://services-sync/constants.js");
ChromeUtils.defineModuleGetter(this, "Log",
"resource://gre/modules/Log.jsm");
ChromeUtils.defineModuleGetter(this, "formAutofillStorage",
"resource://formautofill/FormAutofillStorage.jsm");
// A helper to sanitize address and creditcard records suitable for logging.
function sanitizeStorageObject(ob) {
diff --git browser/extensions/formautofill/FormAutofillUtils.jsm browser/extensions/formautofill/FormAutofillUtils.jsm
--- browser/extensions/formautofill/FormAutofillUtils.jsm
+++ browser/extensions/formautofill/FormAutofillUtils.jsm
@@ -28,19 +28,19 @@ const SECTION_TYPES = {
ADDRESS: "address",
CREDIT_CARD: "creditCard",
};
// The maximum length of data to be saved in a single field for preventing DoS
// attacks that fill the user's hard drive(s).
const MAX_FIELD_VALUE_LENGTH = 200;
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {FormAutofill} = ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
ChromeUtils.defineModuleGetter(this, "CreditCard",
"resource://gre/modules/CreditCard.jsm");
let AddressDataLoader = {
// Status of address data loading. We'll load all the countries with basic level 1
// information while requesting conutry information, and set country to true.
// Level 1 Set is for recording which country's level 1/level 2 data is loaded,
// since we only load this when getCountryAddressData called with level 1 parameter.
diff --git browser/extensions/formautofill/OSKeyStore.jsm browser/extensions/formautofill/OSKeyStore.jsm
--- browser/extensions/formautofill/OSKeyStore.jsm
+++ browser/extensions/formautofill/OSKeyStore.jsm
@@ -7,18 +7,18 @@
*/
"use strict";
var EXPORTED_SYMBOLS = [
"OSKeyStore",
];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "AppConstants", "resource://gre/modules/AppConstants.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "nativeOSKeyStore",
"@mozilla.org/security/oskeystore;1", Ci.nsIOSKeyStore);
XPCOMUtils.defineLazyServiceGetter(this, "osReauthenticator",
"@mozilla.org/security/osreauthenticator;1", Ci.nsIOSReauthenticator);
// Skip reauth during tests, only works in non-official builds.
diff --git browser/extensions/formautofill/ProfileAutoCompleteResult.jsm browser/extensions/formautofill/ProfileAutoCompleteResult.jsm
--- browser/extensions/formautofill/ProfileAutoCompleteResult.jsm
+++ browser/extensions/formautofill/ProfileAutoCompleteResult.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["AddressResult", "CreditCardResult"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {FormAutofill} = ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
ChromeUtils.defineModuleGetter(this, "FormAutofillUtils",
"resource://formautofill/FormAutofillUtils.jsm");
ChromeUtils.defineModuleGetter(this, "CreditCard",
"resource://gre/modules/CreditCard.jsm");
XPCOMUtils.defineLazyPreferenceGetter(this, "insecureWarningEnabled", "security.insecure_field_warning.contextual.enabled");
this.log = null;
diff --git browser/extensions/formautofill/api.js browser/extensions/formautofill/api.js
--- browser/extensions/formautofill/api.js
+++ browser/extensions/formautofill/api.js
@@ -3,18 +3,18 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
/* globals ExtensionAPI */
const CACHED_STYLESHEETS = new WeakMap();
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "FormAutofill",
"resource://formautofill/FormAutofill.jsm");
ChromeUtils.defineModuleGetter(this, "formAutofillParent",
"resource://formautofill/FormAutofillParent.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "resProto",
"@mozilla.org/network/protocol;1?name=resource",
diff --git browser/extensions/formautofill/content/FormAutofillFrameScript.js browser/extensions/formautofill/content/FormAutofillFrameScript.js
--- browser/extensions/formautofill/content/FormAutofillFrameScript.js
+++ browser/extensions/formautofill/content/FormAutofillFrameScript.js
@@ -5,18 +5,18 @@
/*
* Form Autofill frame script.
*/
"use strict";
/* eslint-env mozilla/frame-script */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://formautofill/FormAutofillContent.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {FormAutofillContent} = ChromeUtils.import("resource://formautofill/FormAutofillContent.jsm");
ChromeUtils.defineModuleGetter(this, "setTimeout",
"resource://gre/modules/Timer.jsm");
ChromeUtils.defineModuleGetter(this, "FormAutofill",
"resource://formautofill/FormAutofill.jsm");
ChromeUtils.defineModuleGetter(this, "FormAutofillUtils",
"resource://formautofill/FormAutofillUtils.jsm");
/**
diff --git browser/extensions/formautofill/content/formautofill.xml browser/extensions/formautofill/content/formautofill.xml
--- browser/extensions/formautofill/content/formautofill.xml
+++ browser/extensions/formautofill/content/formautofill.xml
@@ -112,17 +112,17 @@
<setter><![CDATA[
/* global Cu */
if (val) {
this.setAttribute("selected", "true");
} else {
this.removeAttribute("selected");
}
- let {AutoCompletePopup} = ChromeUtils.import("resource://gre/modules/AutoCompletePopup.jsm", {});
+ let {AutoCompletePopup} = ChromeUtils.import("resource://gre/modules/AutoCompletePopup.jsm");
AutoCompletePopup.sendMessageToBrowser("FormAutofill:PreviewProfile");
return val;
]]></setter>
</property>
<method name="_adjustAcItem">
@@ -235,17 +235,17 @@
<method name="_adjustAcItem">
<body>
<![CDATA[
/* global Cu */
this._adjustAutofillItemLayout();
this.setAttribute("formautofillattached", "true");
- let {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm", {});
+ let {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
// TODO: The "Short" suffix is pointless now as normal version string is no longer needed,
// we should consider removing the suffix if possible when the next time locale change.
let buttonTextBundleKey = AppConstants.platform == "macosx" ?
"autocompleteFooterOptionOSXShort" : "autocompleteFooterOptionShort";
let buttonText = this._stringBundle.GetStringFromName(buttonTextBundleKey);
this._optionButton.textContent = buttonText;
let value = JSON.parse(this.getAttribute("ac-value"));
@@ -311,17 +311,17 @@
<div anonid="autofill-item-box" class="autofill-item-box autofill-footer">
<div anonid="autofill-clear-button" class="autofill-footer-row autofill-button"></div>
</div>
</xbl:content>
<handlers>
<handler event="click" button="0"><![CDATA[
/* global Cu */
- let {AutoCompletePopup} = ChromeUtils.import("resource://gre/modules/AutoCompletePopup.jsm", {});
+ let {AutoCompletePopup} = ChromeUtils.import("resource://gre/modules/AutoCompletePopup.jsm");
AutoCompletePopup.sendMessageToBrowser("FormAutofill:ClearForm");
]]></handler>
</handlers>
<implementation implements="nsIDOMXULSelectControlItemElement">
<constructor>
<![CDATA[
diff --git browser/extensions/formautofill/content/l10n.js browser/extensions/formautofill/content/l10n.js
--- browser/extensions/formautofill/content/l10n.js
+++ browser/extensions/formautofill/content/l10n.js
@@ -7,17 +7,17 @@
/**
* This file will be replaced by Fluent but it's a middle ground so we can share
* the edit dialog code with the unprivileged PaymentRequest dialog before the
* Fluent conversion
*/
/* global content */
-ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
+const {FormAutofillUtils} = ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
const CONTENT_WIN = typeof(window) != "undefined" ? window : this;
const L10N_ATTRIBUTES = ["data-localization", "data-localization-region"];
// eslint-disable-next-line mozilla/balanced-listeners
CONTENT_WIN.addEventListener("DOMContentLoaded", function onDCL(evt) {
let doc = evt.target;
diff --git browser/extensions/formautofill/content/manageDialog.js browser/extensions/formautofill/content/manageDialog.js
--- browser/extensions/formautofill/content/manageDialog.js
+++ browser/extensions/formautofill/content/manageDialog.js
@@ -4,20 +4,20 @@
/* exported ManageAddresses, ManageCreditCards */
"use strict";
const EDIT_ADDRESS_URL = "chrome://formautofill/content/editAddress.xhtml";
const EDIT_CREDIT_CARD_URL = "chrome://formautofill/content/editCreditCard.xhtml";
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {FormAutofill} = ChromeUtils.import("resource://formautofill/FormAutofill.jsm");
ChromeUtils.defineModuleGetter(this, "CreditCard",
"resource://gre/modules/CreditCard.jsm");
ChromeUtils.defineModuleGetter(this, "formAutofillStorage",
"resource://formautofill/FormAutofillStorage.jsm");
ChromeUtils.defineModuleGetter(this, "FormAutofillUtils",
"resource://formautofill/FormAutofillUtils.jsm");
ChromeUtils.defineModuleGetter(this, "OSKeyStore",
diff --git browser/extensions/formautofill/test/browser/browser_editCreditCardDialog.js browser/extensions/formautofill/test/browser/browser_editCreditCardDialog.js
--- browser/extensions/formautofill/test/browser/browser_editCreditCardDialog.js
+++ browser/extensions/formautofill/test/browser/browser_editCreditCardDialog.js
@@ -1,14 +1,14 @@
/* eslint-disable mozilla/no-arbitrary-setTimeout */
"use strict";
add_task(async function setup() {
- let {formAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", {});
+ let {formAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm");
await formAutofillStorage.initialize();
});
add_task(async function test_cancelEditCreditCardDialog() {
await testDialog(EDIT_CREDIT_CARD_DIALOG_URL, (win) => {
win.document.querySelector("#cancel").click();
});
});
@@ -260,17 +260,17 @@ add_task(async function test_editInvalid
guid: "invalid-number",
version: 2,
"cc-number": INVALID_CREDIT_CARD_NUMBER,
});
// Directly use FormAutofillStorage so we can set
// sourceSync: true, since saveCreditCard uses FormAutofillParent
// which doesn't expose this option.
- let {formAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", {});
+ let {formAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm");
await formAutofillStorage.initialize();
// Use `sourceSync: true` to bypass field normalization which will
// fail due to the invalid credit card number.
await formAutofillStorage.creditCards.add(TEST_CREDIT_CARD, {sourceSync: true});
let creditCards = await getCreditCards();
is(creditCards.length, 1, "only one credit card is in storage");
is(creditCards[0]["cc-number"], "*********", "invalid credit card number stored");
diff --git browser/extensions/formautofill/test/browser/head.js browser/extensions/formautofill/test/browser/head.js
--- browser/extensions/formautofill/test/browser/head.js
+++ browser/extensions/formautofill/test/browser/head.js
@@ -152,17 +152,17 @@ function getDisplayedPopupItems(browser,
async function sleep(ms = 500) {
await new Promise(resolve => setTimeout(resolve, ms));
}
async function focusAndWaitForFieldsIdentified(browser, selector) {
info("expecting the target input being focused and identified");
/* eslint no-shadow: ["error", { "allow": ["selector", "previouslyFocused", "previouslyIdentified"] }] */
const {previouslyFocused, previouslyIdentified} = await ContentTask.spawn(browser, {selector}, async function({selector}) {
- ChromeUtils.import("resource://gre/modules/FormLikeFactory.jsm");
+ const {FormLikeFactory} = ChromeUtils.import("resource://gre/modules/FormLikeFactory.jsm");
const input = content.document.querySelector(selector);
const rootElement = FormLikeFactory.findRootForField(input);
const previouslyFocused = content.document.activeElement == input;
const previouslyIdentified = rootElement.hasAttribute("test-formautofill-identified");
input.focus();
return {previouslyFocused, previouslyIdentified};
@@ -183,17 +183,17 @@ async function focusAndWaitForFieldsIden
resolve();
});
});
info("FieldsIdentified");
}
// Wait 500ms to ensure that "markAsAutofillField" is completely finished.
await sleep();
await ContentTask.spawn(browser, {}, async function() {
- ChromeUtils.import("resource://gre/modules/FormLikeFactory.jsm");
+ const {FormLikeFactory} = ChromeUtils.import("resource://gre/modules/FormLikeFactory.jsm");
FormLikeFactory
.findRootForField(content.document.activeElement)
.setAttribute("test-formautofill-identified", "true");
});
}
async function expectPopupOpen(browser) {
info("expectPopupOpen");
diff --git browser/extensions/formautofill/test/fixtures/OSKeyStoreTestUtils.jsm browser/extensions/formautofill/test/fixtures/OSKeyStoreTestUtils.jsm
--- browser/extensions/formautofill/test/fixtures/OSKeyStoreTestUtils.jsm
+++ browser/extensions/formautofill/test/fixtures/OSKeyStoreTestUtils.jsm
@@ -3,19 +3,19 @@
"use strict";
var EXPORTED_SYMBOLS = [
"OSKeyStoreTestUtils",
];
ChromeUtils.import("resource://formautofill/OSKeyStore.jsm", this);
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://testing-common/TestUtils.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {TestUtils} = ChromeUtils.import("resource://testing-common/TestUtils.jsm");
var OSKeyStoreTestUtils = {
TEST_ONLY_REAUTH: "extensions.formautofill.osKeyStore.unofficialBuildOnlyLogin",
setup() {
this.ORIGINAL_STORE_LABEL = OSKeyStore.STORE_LABEL;
OSKeyStore.STORE_LABEL = "test-" + Math.random().toString(36).substr(2);
},
diff --git browser/extensions/formautofill/test/mochitest/formautofill_parent_utils.js browser/extensions/formautofill/test/mochitest/formautofill_parent_utils.js
--- browser/extensions/formautofill/test/mochitest/formautofill_parent_utils.js
+++ browser/extensions/formautofill/test/mochitest/formautofill_parent_utils.js
@@ -1,19 +1,19 @@
// assert is available to chrome scripts loaded via SpecialPowers.loadChromeScript.
/* global assert */
/* eslint-env mozilla/frame-script */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
-ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {FormAutofillUtils} = ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
+const {OSKeyStoreTestUtils} = ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm");
-let {formAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", {});
+let {formAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm");
const {ADDRESSES_COLLECTION_NAME, CREDITCARDS_COLLECTION_NAME} = FormAutofillUtils;
var ParentUtils = {
async _getRecords(collectionName) {
return new Promise(resolve => {
Services.cpmm.addMessageListener("FormAutofill:Records", function getResult({data}) {
Services.cpmm.removeMessageListener("FormAutofill:Records", getResult);
diff --git browser/extensions/formautofill/test/mochitest/test_address_level_1_submission.html browser/extensions/formautofill/test/mochitest/test_address_level_1_submission.html
--- browser/extensions/formautofill/test/mochitest/test_address_level_1_submission.html
+++ browser/extensions/formautofill/test/mochitest/test_address_level_1_submission.html
@@ -28,17 +28,17 @@ const TEST_ADDRESSES = [{
add_task(async function test_DE_is_valid_testcase() {
await SpecialPowers.pushPrefEnv({
set: [
["extensions.formautofill.supportedCountries", "US,CA,DE"],
],
});
let chromeScript = SpecialPowers.loadChromeScript(function test_country_data() {
- ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
+ const {AddressDataLoader} = ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
let data = AddressDataLoader.getData("DE");
/* global addMessageListener */
addMessageListener("CheckSubKeys", () => {
return !data.defaultLocale.sub_keys;
});
});
SimpleTest.registerCleanupFunction(() => {
diff --git browser/extensions/formautofill/test/unit/head.js browser/extensions/formautofill/test/unit/head.js
--- browser/extensions/formautofill/test/unit/head.js
+++ browser/extensions/formautofill/test/unit/head.js
@@ -1,39 +1,39 @@
/**
* Provides infrastructure for automated formautofill components tests.
*/
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/ObjectUtils.jsm");
-ChromeUtils.import("resource://gre/modules/FormLikeFactory.jsm");
-ChromeUtils.import("resource://gre/modules/AddonManager.jsm");
-ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
-ChromeUtils.import("resource://testing-common/ExtensionXPCShellUtils.jsm");
-ChromeUtils.import("resource://testing-common/FileTestUtils.jsm");
-ChromeUtils.import("resource://testing-common/MockDocument.jsm");
-ChromeUtils.import("resource://testing-common/TestUtils.jsm");
+var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {ObjectUtils} = ChromeUtils.import("resource://gre/modules/ObjectUtils.jsm");
+var {FormLikeFactory} = ChromeUtils.import("resource://gre/modules/FormLikeFactory.jsm");
+var {AddonManager, AddonManagerPrivate} = ChromeUtils.import("resource://gre/modules/AddonManager.jsm");
+var {AddonTestUtils, MockAsyncShutdown} = ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
+var {ExtensionTestUtils} = ChromeUtils.import("resource://testing-common/ExtensionXPCShellUtils.jsm");
+var {FileTestUtils} = ChromeUtils.import("resource://testing-common/FileTestUtils.jsm");
+var {MockDocument} = ChromeUtils.import("resource://testing-common/MockDocument.jsm");
+var {TestUtils} = ChromeUtils.import("resource://testing-common/TestUtils.jsm");
ChromeUtils.defineModuleGetter(this, "DownloadPaths",
"resource://gre/modules/DownloadPaths.jsm");
ChromeUtils.defineModuleGetter(this, "FileUtils",
"resource://gre/modules/FileUtils.jsm");
ChromeUtils.defineModuleGetter(this, "ExtensionParent",
"resource://gre/modules/ExtensionParent.jsm");
do_get_profile();
// ================================================
// Load mocking/stubbing library, sinon
// docs: http://sinonjs.org/releases/v2.3.2/
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
+var {clearInterval, clearTimeout, setInterval, setIntervalWithTarget, setTimeout, setTimeoutWithTarget} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js", this);
/* globals sinon */
// ================================================
const EXTENSION_ID = "formautofill@mozilla.org";
AddonTestUtils.init(this);
AddonTestUtils.overrideCertDB();
@@ -69,17 +69,17 @@ async function loadExtension() {
// Returns a reference to a temporary file that is guaranteed not to exist and
// is cleaned up later. See FileTestUtils.getTempFile for details.
function getTempFile(leafName) {
return FileTestUtils.getTempFile(leafName);
}
async function initProfileStorage(fileName, records, collectionName = "addresses") {
- let {FormAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", {});
+ let {FormAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", null);
let path = getTempFile(fileName).path;
let profileStorage = new FormAutofillStorage(path);
await profileStorage.initialize();
// AddonTestUtils inserts its own directory provider that manages TmpD.
// It removes that directory at shutdown, which races with shutdown
// handing in JSONFile/DeferredTask (which is used by FormAutofillStorage).
// Avoid the race by explicitly finalizing any formautofill JSONFile
@@ -120,18 +120,18 @@ function verifySectionFieldDetails(secti
delete field.elementWeakRef;
Assert.deepEqual(field, expectedField);
});
});
}
async function runHeuristicsTest(patterns, fixturePathPrefix) {
add_task(async function setup() {
- ChromeUtils.import("resource://formautofill/FormAutofillHeuristics.jsm");
- ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
+ const {FormAutofillHeuristics, LabelUtils} = ChromeUtils.import("resource://formautofill/FormAutofillHeuristics.jsm");
+ const {AddressDataLoader, FormAutofillUtils} = ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
});
patterns.forEach(testPattern => {
add_task(async function() {
info("Starting test fixture: " + testPattern.fixturePath);
let file = do_get_file(fixturePathPrefix + testPattern.fixturePath);
let doc = MockDocument.createTestDocumentFromFile("http://localhost:8080/test/", file);
@@ -222,14 +222,14 @@ add_task(async function head_initialize(
});
await loadExtension();
});
let OSKeyStoreTestUtils;
add_task(async function os_key_store_setup() {
({OSKeyStoreTestUtils} =
- ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm", {}));
+ ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm"));
OSKeyStoreTestUtils.setup();
registerCleanupFunction(async function cleanup() {
await OSKeyStoreTestUtils.cleanup();
});
});
diff --git browser/extensions/formautofill/test/unit/test_activeStatus.js browser/extensions/formautofill/test/unit/test_activeStatus.js
--- browser/extensions/formautofill/test/unit/test_activeStatus.js
+++ browser/extensions/formautofill/test/unit/test_activeStatus.js
@@ -2,17 +2,17 @@
* Test for status handling in Form Autofill Parent.
*/
"use strict";
let FormAutofillParent;
add_task(async function setup() {
- ({FormAutofillParent} = ChromeUtils.import("resource://formautofill/FormAutofillParent.jsm", {}));
+ ({FormAutofillParent} = ChromeUtils.import("resource://formautofill/FormAutofillParent.jsm"));
});
add_task(async function test_activeStatus_init() {
let formAutofillParent = new FormAutofillParent();
sinon.spy(formAutofillParent, "_updateStatus");
// Default status is null before initialization
Assert.equal(formAutofillParent._active, null);
diff --git browser/extensions/formautofill/test/unit/test_addressDataLoader.js browser/extensions/formautofill/test/unit/test_addressDataLoader.js
--- browser/extensions/formautofill/test/unit/test_addressDataLoader.js
+++ browser/extensions/formautofill/test/unit/test_addressDataLoader.js
@@ -11,17 +11,17 @@ const SUPPORT_COUNTRIES_TESTCASES = [
},
{
country: "DE",
properties: ["name"],
},
];
add_task(async function setup() {
- ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
+ const {AddressDataLoader, FormAutofillUtils} = ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
});
add_task(async function test_initalState() {
// addressData should not exist
Assert.equal(AddressDataLoader._addressData, undefined);
// Verify _dataLoaded state
Assert.equal(AddressDataLoader._dataLoaded.country, false);
Assert.equal(AddressDataLoader._dataLoaded.level1.size, 0);
diff --git browser/extensions/formautofill/test/unit/test_autofillFormFields.js browser/extensions/formautofill/test/unit/test_autofillFormFields.js
--- browser/extensions/formautofill/test/unit/test_autofillFormFields.js
+++ browser/extensions/formautofill/test/unit/test_autofillFormFields.js
@@ -1,18 +1,18 @@
/*
* Test for form auto fill content helper fill all inputs function.
*/
/* eslint-disable mozilla/no-arbitrary-setTimeout */
"use strict";
add_task(async function setup() {
- ChromeUtils.import("resource://formautofill/FormAutofillHandler.jsm");
- ChromeUtils.import("resource://formautofill/OSKeyStore.jsm");
+ const {FormAutofillHandler} = ChromeUtils.import("resource://formautofill/FormAutofillHandler.jsm");
+ const {OSKeyStore} = ChromeUtils.import("resource://formautofill/OSKeyStore.jsm");
});
const TESTCASES = [
{
description: "Form without autocomplete property",
document: `<form><input id="given-name"><input id="family-name">
<input id="street-addr"><input id="city"><select id="country"></select>
<input id='email'><input id="tel"></form>`,
diff --git browser/extensions/formautofill/test/unit/test_collectFormFields.js browser/extensions/formautofill/test/unit/test_collectFormFields.js
--- browser/extensions/formautofill/test/unit/test_collectFormFields.js
+++ browser/extensions/formautofill/test/unit/test_collectFormFields.js
@@ -1,16 +1,16 @@
/*
* Test for form auto fill content helper collectFormFields functions.
*/
"use strict";
add_task(async function setup() {
- ChromeUtils.import("resource://formautofill/FormAutofillHandler.jsm");
+ const {FormAutofillHandler} = ChromeUtils.import("resource://formautofill/FormAutofillHandler.jsm");
});
const TESTCASES = [
{
description: "Form without autocomplete property",
document: `<form><input id="given-name"><input id="family-name">
<input id="street-addr"><input id="city"><select id="country"></select>
<input id='email'><input id="phone"></form>`,
diff --git browser/extensions/formautofill/test/unit/test_createRecords.js browser/extensions/formautofill/test/unit/test_createRecords.js
--- browser/extensions/formautofill/test/unit/test_createRecords.js
+++ browser/extensions/formautofill/test/unit/test_createRecords.js
@@ -1,16 +1,16 @@
/*
* Test for the normalization of records created by FormAutofillHandler.
*/
"use strict";
add_task(async function seutp() {
- ChromeUtils.import("resource://formautofill/FormAutofillHandler.jsm");
+ const {FormAutofillHandler} = ChromeUtils.import("resource://formautofill/FormAutofillHandler.jsm");
});
const TESTCASES = [
{
description: "Don't contain a field whose length of value is greater than 200",
document: `<form>
<input id="given-name" autocomplete="given-name">
<input id="organization" autocomplete="organization">
diff --git browser/extensions/formautofill/test/unit/test_creditCardRecords.js browser/extensions/formautofill/test/unit/test_creditCardRecords.js
--- browser/extensions/formautofill/test/unit/test_creditCardRecords.js
+++ browser/extensions/formautofill/test/unit/test_creditCardRecords.js
@@ -1,21 +1,21 @@
/**
* Tests FormAutofillStorage object with creditCards records.
*/
"use strict";
ChromeUtils.defineModuleGetter(this, "Preferences",
"resource://gre/modules/Preferences.jsm");
-ChromeUtils.import("resource://gre/modules/CreditCard.jsm");
+const {CreditCard} = ChromeUtils.import("resource://gre/modules/CreditCard.jsm");
let FormAutofillStorage;
add_task(async function setup() {
- ({FormAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", {}));
+ ({FormAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", null));
});
const TEST_STORE_FILE_NAME = "test-credit-card.json";
const COLLECTION_NAME = "creditCards";
const TEST_CREDIT_CARD_1 = {
"cc-name": "John Doe",
"cc-number": "4929001587121045",
diff --git browser/extensions/formautofill/test/unit/test_extractLabelStrings.js browser/extensions/formautofill/test/unit/test_extractLabelStrings.js
--- browser/extensions/formautofill/test/unit/test_extractLabelStrings.js
+++ browser/extensions/formautofill/test/unit/test_extractLabelStrings.js
@@ -1,12 +1,12 @@
"use strict";
add_task(async function() {
- ChromeUtils.import("resource://formautofill/FormAutofillHeuristics.jsm");
+ const {LabelUtils} = ChromeUtils.import("resource://formautofill/FormAutofillHeuristics.jsm");
});
const TESTCASES = [
{
description: "A label element contains one input element.",
document: `<label id="typeA"> label type A
<!-- This comment should not be extracted. -->
<input type="text">
diff --git browser/extensions/formautofill/test/unit/test_findLabelElements.js browser/extensions/formautofill/test/unit/test_findLabelElements.js
--- browser/extensions/formautofill/test/unit/test_findLabelElements.js
+++ browser/extensions/formautofill/test/unit/test_findLabelElements.js
@@ -1,12 +1,12 @@
"use strict";
add_task(async function() {
- ChromeUtils.import("resource://formautofill/FormAutofillHeuristics.jsm");
+ const {LabelUtils} = ChromeUtils.import("resource://formautofill/FormAutofillHeuristics.jsm");
});
const TESTCASES = [
{
description: "Input contains in a label element.",
document: `<form>
<label id="labelA"> label type A
<input id="typeA" type="text">
diff --git browser/extensions/formautofill/test/unit/test_getAdaptedProfiles.js browser/extensions/formautofill/test/unit/test_getAdaptedProfiles.js
--- browser/extensions/formautofill/test/unit/test_getAdaptedProfiles.js
+++ browser/extensions/formautofill/test/unit/test_getAdaptedProfiles.js
@@ -1,16 +1,16 @@
/*
* Test for form auto fill content helper fill all inputs function.
*/
"use strict";
add_task(async function() {
- ChromeUtils.import("resource://formautofill/FormAutofillHandler.jsm");
+ const {FormAutofillHandler} = ChromeUtils.import("resource://formautofill/FormAutofillHandler.jsm");
});
const DEFAULT_ADDRESS_RECORD = {
"guid": "123",
"street-address": "2 Harrison St\nline2\nline3",
"address-line1": "2 Harrison St",
"address-line2": "line2",
"address-line3": "line3",
diff --git browser/extensions/formautofill/test/unit/test_getCategoriesFromFieldNames.js browser/extensions/formautofill/test/unit/test_getCategoriesFromFieldNames.js
--- browser/extensions/formautofill/test/unit/test_getCategoriesFromFieldNames.js
+++ browser/extensions/formautofill/test/unit/test_getCategoriesFromFieldNames.js
@@ -1,13 +1,13 @@
"use strict";
add_task(async function() {
- ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
+ const {FormAutofillUtils} = ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
});
add_task(async function test_isAddressField_isCreditCardField() {
const TEST_CASES = {
"given-name": {
isAddressField: true,
isCreditCardField: false,
},
diff --git browser/extensions/formautofill/test/unit/test_getFormInputDetails.js browser/extensions/formautofill/test/unit/test_getFormInputDetails.js
--- browser/extensions/formautofill/test/unit/test_getFormInputDetails.js
+++ browser/extensions/formautofill/test/unit/test_getFormInputDetails.js
@@ -1,12 +1,12 @@
"use strict";
add_task(async function() {
- ChromeUtils.import("resource://formautofill/FormAutofillContent.jsm");
+ const {FormAutofillContent} = ChromeUtils.import("resource://formautofill/FormAutofillContent.jsm");
});
const TESTCASES = [
{
description: "Form containing 5 fields with autocomplete attribute.",
document: `<form id="form1">
<input id="street-addr" autocomplete="street-address">
<input id="city" autocomplete="address-level2">
diff --git browser/extensions/formautofill/test/unit/test_getInfo.js browser/extensions/formautofill/test/unit/test_getInfo.js
--- browser/extensions/formautofill/test/unit/test_getInfo.js
+++ browser/extensions/formautofill/test/unit/test_getInfo.js
@@ -1,12 +1,12 @@
"use strict";
add_task(async function() {
- ChromeUtils.import("resource://formautofill/FormAutofillHeuristics.jsm");
+ const {FormAutofillHeuristics, LabelUtils} = ChromeUtils.import("resource://formautofill/FormAutofillHeuristics.jsm");
});
const TESTCASES = [
{
description: "Input element in a label element",
document: `<form>
<label> E-Mail
<input id="targetElement" type="text">
diff --git browser/extensions/formautofill/test/unit/test_getRecords.js browser/extensions/formautofill/test/unit/test_getRecords.js
--- browser/extensions/formautofill/test/unit/test_getRecords.js
+++ browser/extensions/formautofill/test/unit/test_getRecords.js
@@ -1,21 +1,21 @@
/*
* Test for make sure getRecords can retrieve right collection from storage.
*/
"use strict";
-ChromeUtils.import("resource://gre/modules/CreditCard.jsm");
+const {CreditCard} = ChromeUtils.import("resource://gre/modules/CreditCard.jsm");
let FormAutofillParent;
let OSKeyStore;
add_task(async function setup() {
- ({FormAutofillParent} = ChromeUtils.import("resource://formautofill/FormAutofillParent.jsm", {}));
- ({OSKeyStore} = ChromeUtils.import("resource://formautofill/OSKeyStore.jsm", {}));
+ ({FormAutofillParent} = ChromeUtils.import("resource://formautofill/FormAutofillParent.jsm"));
+ ({OSKeyStore} = ChromeUtils.import("resource://formautofill/OSKeyStore.jsm"));
});
const TEST_ADDRESS_1 = {
"given-name": "Timothy",
"additional-name": "John",
"family-name": "Berners-Lee",
organization: "World Wide Web Consortium",
"street-address": "32 Vassar Street\nMIT Room 32-G524",
diff --git browser/extensions/formautofill/test/unit/test_isCJKName.js browser/extensions/formautofill/test/unit/test_isCJKName.js
--- browser/extensions/formautofill/test/unit/test_isCJKName.js
+++ browser/extensions/formautofill/test/unit/test_isCJKName.js
@@ -1,16 +1,16 @@
/**
* Tests the "isCJKName" function of FormAutofillNameUtils object.
*/
"use strict";
add_task(async function setup() {
- ChromeUtils.import("resource://formautofill/FormAutofillNameUtils.jsm");
+ const {FormAutofillNameUtils} = ChromeUtils.import("resource://formautofill/FormAutofillNameUtils.jsm");
});
// Test cases is initially copied from
// https://cs.chromium.org/chromium/src/components/autofill/core/browser/autofill_data_util_unittest.cc
const TESTCASES = [
{
// Non-CJK language with only ASCII characters.
fullName: "Homer Jay Simpson",
diff --git browser/extensions/formautofill/test/unit/test_isFieldEligibleForAutofill.js browser/extensions/formautofill/test/unit/test_isFieldEligibleForAutofill.js
--- browser/extensions/formautofill/test/unit/test_isFieldEligibleForAutofill.js
+++ browser/extensions/formautofill/test/unit/test_isFieldEligibleForAutofill.js
@@ -1,12 +1,12 @@
"use strict";
add_task(async function seutp() {
- ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
+ const {FormAutofillUtils} = ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
});
const TESTCASES = [
{
document: `<input id="targetElement" type="text">`,
fieldId: "targetElement",
expectedResult: true,
},
diff --git browser/extensions/formautofill/test/unit/test_markAsAutofillField.js browser/extensions/formautofill/test/unit/test_markAsAutofillField.js
--- browser/extensions/formautofill/test/unit/test_markAsAutofillField.js
+++ browser/extensions/formautofill/test/unit/test_markAsAutofillField.js
@@ -56,17 +56,17 @@ const TESTCASES = [
"tel",
],
},
];
let markedFieldId = [];
add_task(async function setup() {
- ChromeUtils.import("resource://formautofill/FormAutofillContent.jsm");
+ const {FormAutofillContent} = ChromeUtils.import("resource://formautofill/FormAutofillContent.jsm");
FormAutofillContent._markAsAutofillField = function(field) {
markedFieldId.push(field.id);
};
});
TESTCASES.forEach(testcase => {
add_task(async function() {
diff --git browser/extensions/formautofill/test/unit/test_migrateRecords.js browser/extensions/formautofill/test/unit/test_migrateRecords.js
--- browser/extensions/formautofill/test/unit/test_migrateRecords.js
+++ browser/extensions/formautofill/test/unit/test_migrateRecords.js
@@ -4,18 +4,18 @@
"use strict";
ChromeUtils.import("resource://testing-common/LoginTestUtils.jsm", this);
let FormAutofillStorage;
let OSKeyStore;
add_task(async function setup() {
- ({FormAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", {}));
- ({OSKeyStore} = ChromeUtils.import("resource://formautofill/OSKeyStore.jsm", {}));
+ ({FormAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", null));
+ ({OSKeyStore} = ChromeUtils.import("resource://formautofill/OSKeyStore.jsm"));
});
const TEST_STORE_FILE_NAME = "test-profile.json";
const ADDRESS_SCHEMA_VERSION = 1;
const CREDIT_CARD_SCHEMA_VERSION = 2;
const ADDRESS_TESTCASES = [
diff --git browser/extensions/formautofill/test/unit/test_nameUtils.js browser/extensions/formautofill/test/unit/test_nameUtils.js
--- browser/extensions/formautofill/test/unit/test_nameUtils.js
+++ browser/extensions/formautofill/test/unit/test_nameUtils.js
@@ -1,16 +1,16 @@
/**
* Tests FormAutofillNameUtils object.
*/
"use strict";
add_task(async function() {
- ChromeUtils.import("resource://formautofill/FormAutofillNameUtils.jsm");
+ const {FormAutofillNameUtils} = ChromeUtils.import("resource://formautofill/FormAutofillNameUtils.jsm");
});
// Test cases initially copied from
// https://cs.chromium.org/chromium/src/components/autofill/core/browser/autofill_data_util_unittest.cc
const TESTCASES = [
{
description: "Full name including given, middle and family names",
fullName: "Homer Jay Simpson",
diff --git browser/extensions/formautofill/test/unit/test_onFormSubmitted.js browser/extensions/formautofill/test/unit/test_onFormSubmitted.js
--- browser/extensions/formautofill/test/unit/test_onFormSubmitted.js
+++ browser/extensions/formautofill/test/unit/test_onFormSubmitted.js
@@ -1,12 +1,12 @@
"use strict";
add_task(async function setup() {
- ChromeUtils.import("resource://formautofill/FormAutofillContent.jsm");
+ const {FormAutofillContent} = ChromeUtils.import("resource://formautofill/FormAutofillContent.jsm");
});
const MOCK_DOC = MockDocument.createTestDocument("http://localhost:8080/test/",
`<form id="form1">
<input id="street-addr" autocomplete="street-address">
<select id="address-level1" autocomplete="address-level1">
<option value=""></option>
<option value="AL">Alabama</option>
diff --git browser/extensions/formautofill/test/unit/test_osKeyStore.js browser/extensions/formautofill/test/unit/test_osKeyStore.js
--- browser/extensions/formautofill/test/unit/test_osKeyStore.js
+++ browser/extensions/formautofill/test/unit/test_osKeyStore.js
@@ -3,17 +3,17 @@
*/
"use strict";
let OSKeyStore;
add_task(async function setup() {
Services.prefs.setBoolPref("extensions.formautofill.reauth.enabled", true);
- ({OSKeyStore} = ChromeUtils.import("resource://formautofill/OSKeyStore.jsm", {}));
+ ({OSKeyStore} = ChromeUtils.import("resource://formautofill/OSKeyStore.jsm"));
});
// Ensure that the appropriate initialization has happened.
do_get_profile();
const testText = "test string";
let cipherText;
diff --git browser/extensions/formautofill/test/unit/test_parseAddressFormat.js browser/extensions/formautofill/test/unit/test_parseAddressFormat.js
--- browser/extensions/formautofill/test/unit/test_parseAddressFormat.js
+++ browser/extensions/formautofill/test/unit/test_parseAddressFormat.js
@@ -1,12 +1,12 @@
"use strict";
add_task(async function setup() {
- ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
+ const {FormAutofillUtils} = ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
});
add_task(async function test_parseAddressFormat() {
const TEST_CASES = [
{
fmt: "%N%n%O%n%A%n%C, %S %Z", // US
parsed: [
{fieldId: "name", newLine: true},
diff --git browser/extensions/formautofill/test/unit/test_phoneNumber.js browser/extensions/formautofill/test/unit/test_phoneNumber.js
--- browser/extensions/formautofill/test/unit/test_phoneNumber.js
+++ browser/extensions/formautofill/test/unit/test_phoneNumber.js
@@ -1,17 +1,17 @@
/**
* Tests PhoneNumber.jsm and PhoneNumberNormalizer.jsm.
*/
"use strict";
add_task(async function setup() {
- ChromeUtils.import("resource://formautofill/phonenumberutils/PhoneNumber.jsm");
- ChromeUtils.import("resource://formautofill/phonenumberutils/PhoneNumberNormalizer.jsm");
+ const {PhoneNumber} = ChromeUtils.import("resource://formautofill/phonenumberutils/PhoneNumber.jsm");
+ const {PhoneNumberNormalizer} = ChromeUtils.import("resource://formautofill/phonenumberutils/PhoneNumberNormalizer.jsm");
});
function IsPlain(dial, expected) {
let result = PhoneNumber.IsPlain(dial);
Assert.equal(result, expected);
}
function Normalize(dial, expected) {
diff --git browser/extensions/formautofill/test/unit/test_savedFieldNames.js browser/extensions/formautofill/test/unit/test_savedFieldNames.js
--- browser/extensions/formautofill/test/unit/test_savedFieldNames.js
+++ browser/extensions/formautofill/test/unit/test_savedFieldNames.js
@@ -2,17 +2,17 @@
* Test for keeping the valid fields information in initialProcessData.
*/
"use strict";
let FormAutofillParent;
add_task(async function setup() {
- ({FormAutofillParent} = ChromeUtils.import("resource://formautofill/FormAutofillParent.jsm", {}));
+ ({FormAutofillParent} = ChromeUtils.import("resource://formautofill/FormAutofillParent.jsm"));
});
add_task(async function test_profileSavedFieldNames_init() {
let formAutofillParent = new FormAutofillParent();
sinon.stub(formAutofillParent, "_updateSavedFieldNames");
await formAutofillParent.init();
await formAutofillParent.formAutofillStorage.initialize();
diff --git browser/extensions/formautofill/test/unit/test_storage_remove.js browser/extensions/formautofill/test/unit/test_storage_remove.js
--- browser/extensions/formautofill/test/unit/test_storage_remove.js
+++ browser/extensions/formautofill/test/unit/test_storage_remove.js
@@ -1,17 +1,17 @@
/**
* Tests removing all address/creditcard records.
*/
"use strict";
let FormAutofillStorage;
add_task(async function setup() {
- ({FormAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", {}));
+ ({FormAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", null));
});
const TEST_STORE_FILE_NAME = "test-tombstones.json";
const TEST_ADDRESS_1 = {
"given-name": "Timothy",
"additional-name": "John",
"family-name": "Berners-Lee",
diff --git browser/extensions/formautofill/test/unit/test_storage_tombstones.js browser/extensions/formautofill/test/unit/test_storage_tombstones.js
--- browser/extensions/formautofill/test/unit/test_storage_tombstones.js
+++ browser/extensions/formautofill/test/unit/test_storage_tombstones.js
@@ -1,17 +1,17 @@
/**
* Tests tombstones in address/creditcard records.
*/
"use strict";
let FormAutofillStorage;
add_task(async function setup() {
- ({FormAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", {}));
+ ({FormAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", null));
});
const TEST_STORE_FILE_NAME = "test-tombstones.json";
const TEST_ADDRESS_1 = {
"given-name": "Timothy",
"additional-name": "John",
"family-name": "Berners-Lee",
diff --git browser/extensions/formautofill/test/unit/test_sync.js browser/extensions/formautofill/test/unit/test_sync.js
--- browser/extensions/formautofill/test/unit/test_sync.js
+++ browser/extensions/formautofill/test/unit/test_sync.js
@@ -4,24 +4,24 @@
/* import-globals-from ../../../../../services/sync/tests/unit/head_appinfo.js */
/* import-globals-from ../../../../../services/common/tests/unit/head_helpers.js */
/* import-globals-from ../../../../../services/sync/tests/unit/head_helpers.js */
/* import-globals-from ../../../../../services/sync/tests/unit/head_http_server.js */
"use strict";
-ChromeUtils.import("resource://services-sync/service.js");
-ChromeUtils.import("resource://services-sync/constants.js");
-ChromeUtils.import("resource://testing-common/services/sync/utils.js");
+const {Service} = ChromeUtils.import("resource://services-sync/service.js");
+const {SCORE_INCREMENT_XLARGE} = ChromeUtils.import("resource://services-sync/constants.js");
+const {SyncTestingInfrastructure, encryptPayload} = ChromeUtils.import("resource://testing-common/services/sync/utils.js");
let sanitizeStorageObject, AutofillRecord, AddressesEngine;
add_task(async function() {
({sanitizeStorageObject, AutofillRecord, AddressesEngine} =
- ChromeUtils.import("resource://formautofill/FormAutofillSync.jsm", {}));
+ ChromeUtils.import("resource://formautofill/FormAutofillSync.jsm", null));
});
Services.prefs.setCharPref("extensions.formautofill.loglevel", "Trace");
initTestLogging("Trace");
const TEST_STORE_FILE_NAME = "test-profile.json";
diff --git browser/extensions/formautofill/test/unit/test_toOneLineAddress.js browser/extensions/formautofill/test/unit/test_toOneLineAddress.js
--- browser/extensions/formautofill/test/unit/test_toOneLineAddress.js
+++ browser/extensions/formautofill/test/unit/test_toOneLineAddress.js
@@ -1,13 +1,13 @@
"use strict";
add_task(async function setup() {
- ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
+ const {FormAutofillUtils} = ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
});
add_task(async function test_getCategoriesFromFieldNames() {
const TEST_CASES = [
{
strings: ["A", "B", "C", "D"],
expectedValue: "A B C D",
},
diff --git browser/extensions/formautofill/test/unit/test_transformFields.js browser/extensions/formautofill/test/unit/test_transformFields.js
--- browser/extensions/formautofill/test/unit/test_transformFields.js
+++ browser/extensions/formautofill/test/unit/test_transformFields.js
@@ -1,17 +1,17 @@
/**
* Tests the transform algorithm in profileStorage.
*/
"use strict";
let FormAutofillStorage;
add_task(async function setup() {
- ({FormAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", {}));
+ ({FormAutofillStorage} = ChromeUtils.import("resource://formautofill/FormAutofillStorage.jsm", null));
});
const TEST_STORE_FILE_NAME = "test-profile.json";
const ADDRESS_COMPUTE_TESTCASES = [
// Name
{
description: "Has split names",
diff --git browser/extensions/pdfjs/content/PdfJs.jsm browser/extensions/pdfjs/content/PdfJs.jsm
--- browser/extensions/pdfjs/content/PdfJs.jsm
+++ browser/extensions/pdfjs/content/PdfJs.jsm
@@ -28,18 +28,18 @@ const PREF_ENABLED_CACHE_STATE = PREF_PR
const PREF_ENABLED_CACHE_INITIALIZED = PREF_PREFIX +
".enabledCache.initialized";
const PREF_APP_UPDATE_POSTUPDATE = "app.update.postupdate";
const TOPIC_PDFJS_HANDLER_CHANGED = "pdfjs:handlerChanged";
const TOPIC_PLUGINS_LIST_UPDATED = "plugins-list-updated";
const TOPIC_PLUGIN_INFO_UPDATED = "plugin-info-updated";
const PDF_CONTENT_TYPE = "application/pdf";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var Svc = {};
XPCOMUtils.defineLazyServiceGetter(Svc, "mime",
"@mozilla.org/mime;1",
"nsIMIMEService");
XPCOMUtils.defineLazyServiceGetter(Svc, "pluginHost",
"@mozilla.org/plugin/host;1",
"nsIPluginHost");
diff --git browser/extensions/pdfjs/content/PdfJsNetwork.jsm browser/extensions/pdfjs/content/PdfJsNetwork.jsm
--- browser/extensions/pdfjs/content/PdfJsNetwork.jsm
+++ browser/extensions/pdfjs/content/PdfJsNetwork.jsm
@@ -10,17 +10,17 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var EXPORTED_SYMBOLS = ["NetworkManager"];
function log(aMsg) { // eslint-disable-line no-unused-vars
var msg = "PdfJsNetwork.jsm: " + (aMsg.join ? aMsg.join("") : aMsg);
Services.console.logStringMessage(msg);
}
diff --git browser/extensions/pdfjs/content/PdfJsTelemetry.jsm browser/extensions/pdfjs/content/PdfJsTelemetry.jsm
--- browser/extensions/pdfjs/content/PdfJsTelemetry.jsm
+++ browser/extensions/pdfjs/content/PdfJsTelemetry.jsm
@@ -13,17 +13,17 @@
* limitations under the License.
*/
/* eslint max-len: ["error", 100] */
"use strict";
var EXPORTED_SYMBOLS = ["PdfJsTelemetry"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var PdfJsTelemetry = {
onViewerIsUsed() {
let histogram = Services.telemetry.getHistogramById("PDF_VIEWER_USED");
histogram.add(true);
},
onFallback() {
let histogram = Services.telemetry.getHistogramById("PDF_VIEWER_FALLBACK_SHOWN");
diff --git browser/extensions/pdfjs/content/PdfStreamConverter.jsm browser/extensions/pdfjs/content/PdfStreamConverter.jsm
--- browser/extensions/pdfjs/content/PdfStreamConverter.jsm
+++ browser/extensions/pdfjs/content/PdfStreamConverter.jsm
@@ -19,18 +19,18 @@ var EXPORTED_SYMBOLS = ["PdfStreamConver
const PDFJS_EVENT_ID = "pdf.js.message";
const PREF_PREFIX = "pdfjs";
const PDF_VIEWER_ORIGIN = "resource://pdf.js";
const PDF_VIEWER_WEB_PAGE = "resource://pdf.js/web/viewer.html";
const MAX_NUMBER_OF_PREFS = 50;
const MAX_STRING_PREF_LENGTH = 128;
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "NetUtil",
"resource://gre/modules/NetUtil.jsm");
ChromeUtils.defineModuleGetter(this, "NetworkManager",
"resource://pdf.js/PdfJsNetwork.jsm");
ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
diff --git browser/extensions/pdfjs/content/PdfjsChromeUtils.jsm browser/extensions/pdfjs/content/PdfjsChromeUtils.jsm
--- browser/extensions/pdfjs/content/PdfjsChromeUtils.jsm
+++ browser/extensions/pdfjs/content/PdfjsChromeUtils.jsm
@@ -15,18 +15,18 @@
"use strict";
var EXPORTED_SYMBOLS = ["PdfjsChromeUtils"];
const PREF_PREFIX = "pdfjs";
const PDF_CONTENT_TYPE = "application/pdf";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "PdfJsDefaultPreferences",
"resource://pdf.js/PdfJsDefaultPreferences.jsm");
var Svc = {};
XPCOMUtils.defineLazyServiceGetter(Svc, "mime",
"@mozilla.org/mime;1",
"nsIMIMEService");
diff --git browser/extensions/pdfjs/content/PdfjsContentUtils.jsm browser/extensions/pdfjs/content/PdfjsContentUtils.jsm
--- browser/extensions/pdfjs/content/PdfjsContentUtils.jsm
+++ browser/extensions/pdfjs/content/PdfjsContentUtils.jsm
@@ -12,17 +12,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
"use strict";
var EXPORTED_SYMBOLS = ["PdfjsContentUtils"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var PdfjsContentUtils = {
_mm: Services.cpmm,
/*
* Public API
*/
diff --git browser/extensions/pdfjs/pdfjs.js browser/extensions/pdfjs/pdfjs.js
--- browser/extensions/pdfjs/pdfjs.js
+++ browser/extensions/pdfjs/pdfjs.js
@@ -10,18 +10,18 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PdfStreamConverter",
"resource://pdf.js/PdfStreamConverter.jsm");
// Register/unregister a constructor as a factory.
function StreamConverterFactory() {
if (Services.cpmm.sharedData.get("pdfjs.enabled")) {
return new PdfStreamConverter();
diff --git browser/extensions/webcompat-reporter/experimentalAPIs/aboutConfigPrefs.js browser/extensions/webcompat-reporter/experimentalAPIs/aboutConfigPrefs.js
--- browser/extensions/webcompat-reporter/experimentalAPIs/aboutConfigPrefs.js
+++ browser/extensions/webcompat-reporter/experimentalAPIs/aboutConfigPrefs.js
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
/* global ExtensionAPI, ExtensionCommon */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
this.aboutConfigPrefs = class extends ExtensionAPI {
getAPI(context) {
const EventManager = ExtensionCommon.EventManager;
const extensionIDBase = context.extension.id.split("@")[0];
const endpointPrefName = `extensions.${extensionIDBase}.newIssueEndpoint`;
return {
diff --git browser/extensions/webcompat-reporter/experimentalAPIs/browserInfo.js browser/extensions/webcompat-reporter/experimentalAPIs/browserInfo.js
--- browser/extensions/webcompat-reporter/experimentalAPIs/browserInfo.js
+++ browser/extensions/webcompat-reporter/experimentalAPIs/browserInfo.js
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
/* global ExtensionAPI */
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
this.browserInfo = class extends ExtensionAPI {
getAPI(context) {
return {
browserInfo: {
async getGraphicsPrefs() {
const prefs = {};
for (const [name, dflt] of Object.entries({
diff --git browser/extensions/webcompat-reporter/experimentalAPIs/l10n.js browser/extensions/webcompat-reporter/experimentalAPIs/l10n.js
--- browser/extensions/webcompat-reporter/experimentalAPIs/l10n.js
+++ browser/extensions/webcompat-reporter/experimentalAPIs/l10n.js
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
/* global ExtensionAPI, XPCOMUtils */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyGetter(this, "l10nStrings", function() {
return Services.strings.createBundle(
"chrome://webcompat-reporter/locale/webcompat.properties");
});
let l10nManifest;
diff --git browser/extensions/webcompat-reporter/experimentalAPIs/pageActionExtras.js browser/extensions/webcompat-reporter/experimentalAPIs/pageActionExtras.js
--- browser/extensions/webcompat-reporter/experimentalAPIs/pageActionExtras.js
+++ browser/extensions/webcompat-reporter/experimentalAPIs/pageActionExtras.js
@@ -7,17 +7,17 @@
/* global ExtensionAPI */
this.pageActionExtras = class extends ExtensionAPI {
getAPI(context) {
const extension = context.extension;
const pageActionAPI = extension.apiManager.getAPI("pageAction", extension,
context.envType);
const {Management: {global: {windowTracker}}} =
- ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
return {
pageActionExtras: {
async setDefaultTitle(title) {
pageActionAPI.defaults.title = title;
// Make sure the new default title is considered right away
for (const window of windowTracker.browserWindows()) {
const tab = window.gBrowser.selectedTab;
if (pageActionAPI.isShown(tab)) {
diff --git browser/extensions/webcompat-reporter/experimentalAPIs/tabExtras.js browser/extensions/webcompat-reporter/experimentalAPIs/tabExtras.js
--- browser/extensions/webcompat-reporter/experimentalAPIs/tabExtras.js
+++ browser/extensions/webcompat-reporter/experimentalAPIs/tabExtras.js
@@ -6,17 +6,17 @@
/* global ExtensionAPI, XPCOMUtils */
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
function getInfoFrameScript(messageName) {
/* eslint-env mozilla/frame-script */
- ChromeUtils.import("resource://gre/modules/Services.jsm");
+ var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
function getInnerWindowId(window) {
return window.windowUtils.currentInnerWindowID;
}
function getInnerWindowIDsForAllFrames(window) {
const innerWindowID = getInnerWindowId(window);
let ids = [innerWindowID];
@@ -85,17 +85,17 @@ function getInfoFrameScript(messageName)
log: getLoggedMessages(content),
});
}
this.tabExtras = class extends ExtensionAPI {
getAPI(context) {
const {tabManager} = context.extension;
const {Management: {global: {windowTracker}}} =
- ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
return {
tabExtras: {
async loadURIWithPostData(tabId, url, postData, postDataContentType) {
const tab = tabManager.get(tabId);
if (!tab || !tab.browser) {
return Promise.reject("Invalid tab");
}
diff --git browser/extensions/webcompat-reporter/test/browser/head.js browser/extensions/webcompat-reporter/test/browser/head.js
--- browser/extensions/webcompat-reporter/test/browser/head.js
+++ browser/extensions/webcompat-reporter/test/browser/head.js
@@ -1,14 +1,14 @@
"use strict";
ChromeUtils.defineModuleGetter(this, "AddonManager",
"resource://gre/modules/AddonManager.jsm");
-const {Management} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+const {Management} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
const PREF_WC_REPORTER_ENABLED = "extensions.webcompat-reporter.enabled";
const PREF_WC_REPORTER_ENDPOINT = "extensions.webcompat-reporter.newIssueEndpoint";
const TEST_ROOT = getRootDirectory(gTestPath).replace("chrome://mochitests/content", "http://example.com");
const TEST_PAGE = TEST_ROOT + "test.html";
const NEW_ISSUE_PAGE = TEST_ROOT + "webcompat.html";
@@ -166,17 +166,17 @@ async function startIssueServer() {
xhr.open("GET", NEW_ISSUE_PAGE);
xhr.onload = () => {
resolve(xhr.responseText);
};
xhr.onerror = reject;
xhr.send();
});
- const {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js", {});
+ const {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js");
const server = new HttpServer();
registerCleanupFunction(async function cleanup() {
await new Promise(resolve => server.stop(resolve));
});
server.registerPathHandler("/new", function(request, response) {
response.setHeader("Content-Type", "text/html", false);
diff --git browser/extensions/webcompat/aboutConfigPrefs.js browser/extensions/webcompat/aboutConfigPrefs.js
--- browser/extensions/webcompat/aboutConfigPrefs.js
+++ browser/extensions/webcompat/aboutConfigPrefs.js
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
/* global ExtensionAPI, ExtensionCommon */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
this.aboutConfigPrefs = class extends ExtensionAPI {
getAPI(context) {
const EventManager = ExtensionCommon.EventManager;
const extensionIDBase = context.extension.id.split("@")[0];
const extensionPrefNameBase = `extensions.${extensionIDBase}.`;
return {
diff --git browser/modules/AboutNewTab.jsm browser/modules/AboutNewTab.jsm
--- browser/modules/AboutNewTab.jsm
+++ browser/modules/AboutNewTab.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = [ "AboutNewTab" ];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
ActivityStream: "resource://activity-stream/lib/ActivityStream.jsm",
RemotePages: "resource://gre/modules/remotepagemanager/RemotePageManagerParent.jsm",
});
const BROWSER_READY_NOTIFICATION = "sessionstore-windows-restored";
diff --git browser/modules/AsanReporter.jsm browser/modules/AsanReporter.jsm
--- browser/modules/AsanReporter.jsm
+++ browser/modules/AsanReporter.jsm
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
this.EXPORTED_SYMBOLS = ["AsanReporter"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.jsm",
Log: "resource://gre/modules/Log.jsm",
OS: "resource://gre/modules/osfile.jsm",
Services: "resource://gre/modules/Services.jsm",
});
diff --git browser/modules/AsyncTabSwitcher.jsm browser/modules/AsyncTabSwitcher.jsm
--- browser/modules/AsyncTabSwitcher.jsm
+++ browser/modules/AsyncTabSwitcher.jsm
@@ -2,17 +2,17 @@
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["AsyncTabSwitcher"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.jsm",
Services: "resource://gre/modules/Services.jsm",
});
XPCOMUtils.defineLazyPreferenceGetter(this, "gTabWarmingEnabled",
"browser.tabs.remote.warmup.enabled");
XPCOMUtils.defineLazyPreferenceGetter(this, "gTabWarmingMax",
diff --git browser/modules/BrowserErrorReporter.jsm browser/modules/BrowserErrorReporter.jsm
--- browser/modules/BrowserErrorReporter.jsm
+++ browser/modules/BrowserErrorReporter.jsm
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Log", "resource://gre/modules/Log.jsm");
ChromeUtils.defineModuleGetter(this, "UpdateUtils", "resource://gre/modules/UpdateUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["fetch", "URL"]);
var EXPORTED_SYMBOLS = ["BrowserErrorReporter"];
diff --git browser/modules/BrowserUsageTelemetry.jsm browser/modules/BrowserUsageTelemetry.jsm
--- browser/modules/BrowserUsageTelemetry.jsm
+++ browser/modules/BrowserUsageTelemetry.jsm
@@ -8,17 +8,17 @@
var EXPORTED_SYMBOLS = [
"BrowserUsageTelemetry",
"URICountListener",
"URLBAR_SELECTED_RESULT_TYPES",
"URLBAR_SELECTED_RESULT_METHODS",
"MINIMUM_TAB_COUNT_INTERVAL_MS",
];
-const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", null);
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
SearchTelemetry: "resource:///modules/SearchTelemetry.jsm",
Services: "resource://gre/modules/Services.jsm",
setTimeout: "resource://gre/modules/Timer.jsm",
});
diff --git browser/modules/BrowserWindowTracker.jsm browser/modules/BrowserWindowTracker.jsm
--- browser/modules/BrowserWindowTracker.jsm
+++ browser/modules/BrowserWindowTracker.jsm
@@ -4,18 +4,18 @@
/*
* This module tracks each browser window and informs network module
* the current selected tab's content outer window ID.
*/
var EXPORTED_SYMBOLS = ["BrowserWindowTracker"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Lazy getters
XPCOMUtils.defineLazyModuleGetters(this, {
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
});
// Constants
const TAB_EVENTS = ["TabBrowserInserted", "TabSelect"];
diff --git browser/modules/ContentClick.jsm browser/modules/ContentClick.jsm
--- browser/modules/ContentClick.jsm
+++ browser/modules/ContentClick.jsm
@@ -2,17 +2,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = [ "ContentClick" ];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUIUtils",
"resource:///modules/PlacesUIUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
var ContentClick = {
// Listeners are added in nsBrowserGlue.js
diff --git browser/modules/ContentCrashHandlers.jsm browser/modules/ContentCrashHandlers.jsm
--- browser/modules/ContentCrashHandlers.jsm
+++ browser/modules/ContentCrashHandlers.jsm
@@ -3,18 +3,18 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = [ "TabCrashHandler",
"PluginCrashReporter",
"UnsubmittedCrashHandler" ];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.jsm",
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
clearTimeout: "resource://gre/modules/Timer.jsm",
CrashSubmit: "resource://gre/modules/CrashSubmit.jsm",
PluralForm: "resource://gre/modules/PluralForm.jsm",
RemotePages: "resource://gre/modules/remotepagemanager/RemotePageManagerParent.jsm",
diff --git browser/modules/ContentMetaHandler.jsm browser/modules/ContentMetaHandler.jsm
--- browser/modules/ContentMetaHandler.jsm
+++ browser/modules/ContentMetaHandler.jsm
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
// Debounce time in milliseconds - this should be long enough to account for
// sync script tags that could appear between desired meta tags
const TIMEOUT_DELAY = 1000;
const ACCEPTED_PROTOCOLS = ["http:", "https:"];
diff --git browser/modules/ContentObservers.js browser/modules/ContentObservers.js
--- browser/modules/ContentObservers.js
+++ browser/modules/ContentObservers.js
@@ -9,17 +9,17 @@
* observer service notifications to the chrome process through
* message passing. Using a process script avoids having them in
* content.js and thereby registering N observers for N open tabs,
* which is bad for perf.
*/
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "WebRTCChild",
"resource:///actors/WebRTCChild.jsm");
var gEMEUIObserver = function(subject, topic, data) {
let win = subject.top;
let mm = getMessageManagerForWindow(win);
if (mm) {
diff --git browser/modules/ContentSearch.jsm browser/modules/ContentSearch.jsm
--- browser/modules/ContentSearch.jsm
+++ browser/modules/ContentSearch.jsm
@@ -2,18 +2,18 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = [
"ContentSearch",
];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["XMLHttpRequest"]);
ChromeUtils.defineModuleGetter(this, "FormHistory",
"resource://gre/modules/FormHistory.jsm");
ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
ChromeUtils.defineModuleGetter(this, "SearchSuggestionController",
diff --git browser/modules/Discovery.jsm browser/modules/Discovery.jsm
--- browser/modules/Discovery.jsm
+++ browser/modules/Discovery.jsm
@@ -2,18 +2,18 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = [
"Discovery",
];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "ClientID",
"resource://gre/modules/ClientID.jsm");
ChromeUtils.defineModuleGetter(this, "ContextualIdentityService",
"resource://gre/modules/ContextualIdentityService.jsm");
const RECOMMENDATION_ENABLED = "browser.discovery.enabled";
const TELEMETRY_ENABLED = "datareporting.healthreport.uploadEnabled";
diff --git browser/modules/ExtensionsUI.jsm browser/modules/ExtensionsUI.jsm
--- browser/modules/ExtensionsUI.jsm
+++ browser/modules/ExtensionsUI.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["ExtensionsUI"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/EventEmitter.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {EventEmitter} = ChromeUtils.import("resource://gre/modules/EventEmitter.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
AddonManagerPrivate: "resource://gre/modules/AddonManager.jsm",
AMTelemetry: "resource://gre/modules/AddonManager.jsm",
AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
ExtensionData: "resource://gre/modules/Extension.jsm",
Services: "resource://gre/modules/Services.jsm",
diff --git browser/modules/FaviconLoader.jsm browser/modules/FaviconLoader.jsm
--- browser/modules/FaviconLoader.jsm
+++ browser/modules/FaviconLoader.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const EXPORTED_SYMBOLS = ["FaviconLoader"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["Blob", "FileReader"]);
ChromeUtils.defineModuleGetter(this, "DeferredTask",
"resource://gre/modules/DeferredTask.jsm");
ChromeUtils.defineModuleGetter(this, "PromiseUtils",
"resource://gre/modules/PromiseUtils.jsm");
diff --git browser/modules/HomePage.jsm browser/modules/HomePage.jsm
--- browser/modules/HomePage.jsm
+++ browser/modules/HomePage.jsm
@@ -4,17 +4,17 @@
/* globals ChromeUtils, Services */
/* exported HomePage */
"use strict";
var EXPORTED_SYMBOLS = ["HomePage"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const kPrefName = "browser.startup.homepage";
function getHomepagePref(useDefault) {
let homePage;
let prefs = Services.prefs;
if (useDefault) {
prefs = prefs.getDefaultBranch(null);
diff --git browser/modules/LaterRun.jsm browser/modules/LaterRun.jsm
--- browser/modules/LaterRun.jsm
+++ browser/modules/LaterRun.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["LaterRun"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const kEnabledPref = "browser.laterrun.enabled";
const kPagePrefRoot = "browser.laterrun.pages.";
// Number of sessions we've been active in
const kSessionCountPref = "browser.laterrun.bookkeeping.sessionCount";
// Time the profile was created at:
const kProfileCreationTime = "browser.laterrun.bookkeeping.profileCreationTime";
diff --git browser/modules/LiveBookmarkMigrator.jsm browser/modules/LiveBookmarkMigrator.jsm
--- browser/modules/LiveBookmarkMigrator.jsm
+++ browser/modules/LiveBookmarkMigrator.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
OS: "resource://gre/modules/osfile.jsm",
PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
});
XPCOMUtils.defineLazyGlobalGetters(this, ["URL", "XMLSerializer"]);
diff --git browser/modules/OpenInTabsUtils.jsm browser/modules/OpenInTabsUtils.jsm
--- browser/modules/OpenInTabsUtils.jsm
+++ browser/modules/OpenInTabsUtils.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
this.EXPORTED_SYMBOLS = ["OpenInTabsUtils"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyGetter(this, "bundle", function() {
return Services.strings.createBundle("chrome://browser/locale/tabbrowser.properties");
});
/**
* Utility functions that can be used when opening multiple tabs, that can be
* called without any tabbrowser instance.
diff --git browser/modules/PageActions.jsm browser/modules/PageActions.jsm
--- browser/modules/PageActions.jsm
+++ browser/modules/PageActions.jsm
@@ -8,17 +8,17 @@ var EXPORTED_SYMBOLS = [
"PageActions",
// PageActions.Action
// PageActions.ACTION_ID_BOOKMARK
// PageActions.ACTION_ID_BOOKMARK_SEPARATOR
// PageActions.ACTION_ID_BUILT_IN_SEPARATOR
// PageActions.ACTION_ID_TRANSIENT_SEPARATOR
];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm");
ChromeUtils.defineModuleGetter(this, "AsyncShutdown",
"resource://gre/modules/AsyncShutdown.jsm");
ChromeUtils.defineModuleGetter(this, "BinarySearch",
"resource://gre/modules/BinarySearch.jsm");
ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
diff --git browser/modules/PermissionUI.jsm browser/modules/PermissionUI.jsm
--- browser/modules/PermissionUI.jsm
+++ browser/modules/PermissionUI.jsm
@@ -55,17 +55,17 @@ var EXPORTED_SYMBOLS = [
* and going through nsIContentPermissionPrompt.
*
* It is, however, possible to take advantage of PermissionPrompt without
* having to go through nsIContentPermissionPrompt or with a
* nsIContentPermissionRequest. The PermissionPromptPrototype can be
* imported, subclassed, and have prompt() called directly, without
* the caller having called into createPermissionPrompt.
*/
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Services",
"resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "SitePermissions",
"resource:///modules/SitePermissions.jsm");
ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
ChromeUtils.defineModuleGetter(this, "URICountListener",
diff --git browser/modules/PingCentre.jsm browser/modules/PingCentre.jsm
--- browser/modules/PingCentre.jsm
+++ browser/modules/PingCentre.jsm
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]);
ChromeUtils.defineModuleGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm");
ChromeUtils.defineModuleGetter(this, "UpdateUtils",
"resource://gre/modules/UpdateUtils.jsm");
ChromeUtils.defineModuleGetter(this, "ClientID",
"resource://gre/modules/ClientID.jsm");
diff --git browser/modules/ProcessHangMonitor.jsm browser/modules/ProcessHangMonitor.jsm
--- browser/modules/ProcessHangMonitor.jsm
+++ browser/modules/ProcessHangMonitor.jsm
@@ -2,18 +2,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["ProcessHangMonitor"];
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
/**
* This JSM is responsible for observing content process hang reports
* and asking the user what to do about them. See nsIHangReport for
* the platform interface.
*/
var ProcessHangMonitor = {
diff --git browser/modules/ReaderParent.jsm browser/modules/ReaderParent.jsm
--- browser/modules/ReaderParent.jsm
+++ browser/modules/ReaderParent.jsm
@@ -2,17 +2,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = [ "ReaderParent" ];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils", "resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(this, "ReaderMode", "resource://gre/modules/ReaderMode.jsm");
const gStringBundle = Services.strings.createBundle("chrome://global/locale/aboutReader.properties");
var ReaderParent = {
// Listeners are added in nsBrowserGlue.js
diff --git browser/modules/Sanitizer.jsm browser/modules/Sanitizer.jsm
--- browser/modules/Sanitizer.jsm
+++ browser/modules/Sanitizer.jsm
@@ -1,17 +1,17 @@
// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var EXPORTED_SYMBOLS = ["Sanitizer"];
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.jsm",
PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
FormHistory: "resource://gre/modules/FormHistory.jsm",
ContextualIdentityService: "resource://gre/modules/ContextualIdentityService.jsm",
});
diff --git browser/modules/SiteDataManager.jsm browser/modules/SiteDataManager.jsm
--- browser/modules/SiteDataManager.jsm
+++ browser/modules/SiteDataManager.jsm
@@ -1,12 +1,12 @@
"use strict";
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "OfflineAppCacheHelper",
"resource://gre/modules/offlineAppCache.jsm");
ChromeUtils.defineModuleGetter(this, "ServiceWorkerCleanUp",
"resource://gre/modules/ServiceWorkerCleanUp.jsm");
var EXPORTED_SYMBOLS = [
"SiteDataManager",
diff --git browser/modules/SitePermissions.jsm browser/modules/SitePermissions.jsm
--- browser/modules/SitePermissions.jsm
+++ browser/modules/SitePermissions.jsm
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var EXPORTED_SYMBOLS = [ "SitePermissions" ];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
var gStringBundle =
Services.strings.createBundle("chrome://browser/locale/sitePermissions.properties");
/**
* A helper module to manage temporary permissions.
*
* Permissions are keyed by browser, so methods take a Browser
diff --git browser/modules/TransientPrefs.jsm browser/modules/TransientPrefs.jsm
--- browser/modules/TransientPrefs.jsm
+++ browser/modules/TransientPrefs.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["TransientPrefs"];
-ChromeUtils.import("resource://gre/modules/Preferences.jsm");
+const {Preferences} = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
var prefVisibility = new Map;
/* Use for preferences that should only be visible when they've been modified.
When reset to their default state, they remain visible until restarting the
application. */
var TransientPrefs = {
diff --git browser/modules/Windows8WindowFrameColor.jsm browser/modules/Windows8WindowFrameColor.jsm
--- browser/modules/Windows8WindowFrameColor.jsm
+++ browser/modules/Windows8WindowFrameColor.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["Windows8WindowFrameColor"];
-var {WindowsRegistry: Registry} = ChromeUtils.import("resource://gre/modules/WindowsRegistry.jsm", null);
+var {WindowsRegistry: Registry} = ChromeUtils.import("resource://gre/modules/WindowsRegistry.jsm");
var Windows8WindowFrameColor = {
_windowFrameColor: null,
get() {
if (this._windowFrameColor)
return this._windowFrameColor;
diff --git browser/modules/WindowsJumpLists.jsm browser/modules/WindowsJumpLists.jsm
--- browser/modules/WindowsJumpLists.jsm
+++ browser/modules/WindowsJumpLists.jsm
@@ -1,15 +1,15 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Stop updating jumplists after some idle time.
const IDLE_TIMEOUT_SECONDS = 5 * 60;
// Prefs
const PREF_TASKBAR_BRANCH = "browser.taskbar.lists.";
const PREF_TASKBAR_ENABLED = "enabled";
const PREF_TASKBAR_ITEMCOUNT = "maxListItemCount";
diff --git browser/modules/WindowsPreviewPerTab.jsm browser/modules/WindowsPreviewPerTab.jsm
--- browser/modules/WindowsPreviewPerTab.jsm
+++ browser/modules/WindowsPreviewPerTab.jsm
@@ -38,21 +38,21 @@
* the tab previews. This tells the taskbar to revert to one preview per window.
* If the number of tabs falls below this magic threshold, the preview-per-tab
* behavior returns. There is no reliable way to determine when the scroll
* buttons appear on the taskbar, so a magic pref-controlled number determines
* when this threshold has been crossed.
*/
var EXPORTED_SYMBOLS = ["AeroPeek"];
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
-ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const {PlacesUtils} = ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
+const {PrivateBrowsingUtils} = ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
// Pref to enable/disable preview-per-tab
const TOGGLE_PREF_NAME = "browser.taskbar.previews.enable";
// Pref to determine the magic auto-disable threshold
const DISABLE_THRESHOLD_PREF_NAME = "browser.taskbar.previews.max";
// Pref to control the time in seconds that tab contents live in the cache
const CACHE_EXPIRATION_TIME_PREF_NAME = "browser.taskbar.previews.cachetime";
diff --git browser/modules/ZoomUI.jsm browser/modules/ZoomUI.jsm
--- browser/modules/ZoomUI.jsm
+++ browser/modules/ZoomUI.jsm
@@ -2,17 +2,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = [ "ZoomUI" ];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var ZoomUI = {
init(aWindow) {
aWindow.addEventListener("EndSwapDocShells", onEndSwapDocShells, true);
aWindow.addEventListener("FullZoomChange", onZoomChange);
aWindow.addEventListener("TextZoomChange", onZoomChange);
aWindow.addEventListener("unload", () => {
aWindow.removeEventListener("EndSwapDocShells", onEndSwapDocShells, true);
@@ -94,17 +94,17 @@ function updateZoomUI(aBrowser, aAnimate
urlbarZoomButton.setAttribute("animate", "true");
} else {
urlbarZoomButton.removeAttribute("animate");
}
urlbarZoomButton.setAttribute("label", label);
}
}
-ChromeUtils.import("resource:///modules/CustomizableUI.jsm");
+const {CustomizableUI} = ChromeUtils.import("resource:///modules/CustomizableUI.jsm");
let customizationListener = {};
customizationListener.onWidgetAdded =
customizationListener.onWidgetRemoved =
customizationListener.onWidgetMoved = function(aWidgetId) {
if (aWidgetId == "zoom-controls") {
for (let window of CustomizableUI.windows) {
updateZoomUI(window.gBrowser.selectedBrowser);
}
diff --git browser/modules/test/browser/browser_BrowserWindowTracker.js browser/modules/test/browser/browser_BrowserWindowTracker.js
--- browser/modules/test/browser/browser_BrowserWindowTracker.js
+++ browser/modules/test/browser/browser_BrowserWindowTracker.js
@@ -1,12 +1,12 @@
"use strict";
-ChromeUtils.import("resource:///modules/BrowserWindowTracker.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {BrowserWindowTracker} = ChromeUtils.import("resource:///modules/BrowserWindowTracker.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
const TEST_WINDOW = window;
function windowActivated(win) {
if (Services.ww.activeWindow == win) {
return Promise.resolve();
}
return BrowserTestUtils.waitForEvent(win, "activate");
diff --git browser/modules/test/browser/browser_LiveBookmarkMigrator.js browser/modules/test/browser/browser_LiveBookmarkMigrator.js
--- browser/modules/test/browser/browser_LiveBookmarkMigrator.js
+++ browser/modules/test/browser/browser_LiveBookmarkMigrator.js
@@ -4,17 +4,17 @@
"use strict";
// Check migrator can open the SUMO page.
add_task(async function() {
let expectedURL = Services.prefs.getCharPref("app.support.baseURL") +
"live-bookmarks-migration";
let newTabExpected = BrowserTestUtils.waitForNewTab(gBrowser, expectedURL, true);
- let {LiveBookmarkMigrator} = ChromeUtils.import("resource:///modules/LiveBookmarkMigrator.jsm", {});
+ let {LiveBookmarkMigrator} = ChromeUtils.import("resource:///modules/LiveBookmarkMigrator.jsm");
LiveBookmarkMigrator._openSUMOPage();
await newTabExpected;
// If we get here, this is guaranteed to pass, but otherwise mochitest complains that
// the test has no assertions.
is(gBrowser.selectedBrowser.currentURI.spec, expectedURL, "Should have opened the right page");
gBrowser.removeCurrentTab();
});
diff --git browser/modules/test/browser/browser_ProcessHangNotifications.js browser/modules/test/browser/browser_ProcessHangNotifications.js
--- browser/modules/test/browser/browser_ProcessHangNotifications.js
+++ browser/modules/test/browser/browser_ProcessHangNotifications.js
@@ -1,14 +1,14 @@
/* globals ProcessHangMonitor */
const { WebExtensionPolicy } =
Cu.getGlobalForObject(ChromeUtils.import("resource://gre/modules/Services.jsm", {}));
-ChromeUtils.import("resource://gre/modules/UpdateUtils.jsm");
+const {UpdateUtils} = ChromeUtils.import("resource://gre/modules/UpdateUtils.jsm");
function promiseNotificationShown(aWindow, aName) {
return new Promise((resolve) => {
let notificationBox = aWindow.gHighPriorityNotificationBox;
notificationBox.stack.addEventListener("AlertActive", function() {
is(notificationBox.allNotifications.length, 1, "Notification Displayed.");
resolve(notificationBox);
}, {once: true});
diff --git browser/modules/test/browser/browser_UnsubmittedCrashHandler.js browser/modules/test/browser/browser_UnsubmittedCrashHandler.js
--- browser/modules/test/browser/browser_UnsubmittedCrashHandler.js
+++ browser/modules/test/browser/browser_UnsubmittedCrashHandler.js
@@ -1,23 +1,23 @@
"use strict";
/**
* This suite tests the "unsubmitted crash report" notification
* that is seen when we detect pending crash reports on startup.
*/
const { UnsubmittedCrashHandler } =
- ChromeUtils.import("resource:///modules/ContentCrashHandlers.jsm", {});
+ ChromeUtils.import("resource:///modules/ContentCrashHandlers.jsm");
const { FileUtils } =
- ChromeUtils.import("resource://gre/modules/FileUtils.jsm", {});
+ ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
const { makeFakeAppDir } =
- ChromeUtils.import("resource://testing-common/AppData.jsm", {});
+ ChromeUtils.import("resource://testing-common/AppData.jsm");
const { OS } =
- ChromeUtils.import("resource://gre/modules/osfile.jsm", {});
+ ChromeUtils.import("resource://gre/modules/osfile.jsm");
const DAY = 24 * 60 * 60 * 1000; // milliseconds
const SERVER_URL = "http://example.com/browser/toolkit/crashreporter/test/browser/crashreport.sjs";
/**
* Returns the directly where the browsing is storing the
* pending crash reports.
*
diff --git browser/modules/test/browser/browser_UsageTelemetry_private_and_restore.js browser/modules/test/browser/browser_UsageTelemetry_private_and_restore.js
--- browser/modules/test/browser/browser_UsageTelemetry_private_and_restore.js
+++ browser/modules/test/browser/browser_UsageTelemetry_private_and_restore.js
@@ -1,11 +1,11 @@
"use strict";
-const {Utils} = ChromeUtils.import("resource://gre/modules/sessionstore/Utils.jsm", {});
+const {Utils} = ChromeUtils.import("resource://gre/modules/sessionstore/Utils.jsm");
const triggeringPrincipal_base64 = Utils.SERIALIZED_SYSTEMPRINCIPAL;
const MAX_CONCURRENT_TABS = "browser.engagement.max_concurrent_tab_count";
const TAB_EVENT_COUNT = "browser.engagement.tab_open_event_count";
const MAX_CONCURRENT_WINDOWS = "browser.engagement.max_concurrent_window_count";
const WINDOW_OPEN_COUNT = "browser.engagement.window_open_event_count";
const TOTAL_URI_COUNT = "browser.engagement.total_uri_count";
const UNFILTERED_URI_COUNT = "browser.engagement.unfiltered_uri_count";
diff --git browser/modules/test/unit/test_E10SUtils_nested_URIs.js browser/modules/test/unit/test_E10SUtils_nested_URIs.js
--- browser/modules/test/unit/test_E10SUtils_nested_URIs.js
+++ browser/modules/test/unit/test_E10SUtils_nested_URIs.js
@@ -1,13 +1,13 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-ChromeUtils.import("resource://gre/modules/E10SUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {E10SUtils} = ChromeUtils.import("resource://gre/modules/E10SUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var TEST_PREFERRED_REMOTE_TYPES = [
E10SUtils.WEB_REMOTE_TYPE,
E10SUtils.NOT_REMOTE,
"fakeRemoteType",
];
// These test cases give a nestedURL and a plainURL that should always load in
diff --git browser/modules/test/unit/test_HomePage.js browser/modules/test/unit/test_HomePage.js
--- browser/modules/test/unit/test_HomePage.js
+++ browser/modules/test/unit/test_HomePage.js
@@ -1,17 +1,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
/* globals ChromeUtils, Services, Cc, Ci, HomePage, Assert, add_task */
"use strict";
-ChromeUtils.import("resource:///modules/HomePage.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {HomePage} = ChromeUtils.import("resource:///modules/HomePage.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
add_task(function testHomePage() {
Assert.ok(!HomePage.overridden, "Homepage should not be overriden by default.");
let newvalue = "about:blank|about:newtab";
HomePage.set(newvalue);
Assert.ok(HomePage.overridden, "Homepage should be overriden after set()");
Assert.equal(HomePage.get(), newvalue, "Homepage should be ${newvalue}");
Assert.notEqual(HomePage.getDefault(), newvalue, "Homepage should be ${newvalue}");
diff --git browser/modules/test/unit/test_LaterRun.js browser/modules/test/unit/test_LaterRun.js
--- browser/modules/test/unit/test_LaterRun.js
+++ browser/modules/test/unit/test_LaterRun.js
@@ -1,20 +1,20 @@
"use strict";
const kEnabledPref = "browser.laterrun.enabled";
const kPagePrefRoot = "browser.laterrun.pages.";
const kSessionCountPref = "browser.laterrun.bookkeeping.sessionCount";
const kProfileCreationTime = "browser.laterrun.bookkeeping.profileCreationTime";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/LaterRun.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {LaterRun} = ChromeUtils.import("resource:///modules/LaterRun.jsm");
Services.prefs.setBoolPref(kEnabledPref, true);
-ChromeUtils.import("resource://testing-common/AppInfo.jsm");
+const {updateAppInfo} = ChromeUtils.import("resource://testing-common/AppInfo.jsm");
updateAppInfo();
add_task(async function test_page_applies() {
Services.prefs.setCharPref(kPagePrefRoot + "test_LaterRun_unittest.url", "https://www.mozilla.org/%VENDOR%/%NAME%/%ID%/%VERSION%/");
Services.prefs.setIntPref(kPagePrefRoot + "test_LaterRun_unittest.minimumHoursSinceInstall", 10);
Services.prefs.setIntPref(kPagePrefRoot + "test_LaterRun_unittest.minimumSessionCount", 3);
let pages = LaterRun.readPages();
diff --git browser/modules/test/unit/test_LiveBookmarkMigrator.js browser/modules/test/unit/test_LiveBookmarkMigrator.js
--- browser/modules/test/unit/test_LiveBookmarkMigrator.js
+++ browser/modules/test/unit/test_LiveBookmarkMigrator.js
@@ -16,19 +16,19 @@ ChromeUtils.import("resource://testing-c
updateAppInfo({
name: "LiveBookmarkMigratorTest",
ID: "{230de50e-4cd1-11dc-8314-0800200c9a66}",
version: "1",
platformVersion: "",
});
const {PlacesUtils} =
- ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm", {});
+ ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
const {LiveBookmarkMigrator} =
- ChromeUtils.import("resource:///modules/LiveBookmarkMigrator.jsm", {});
+ ChromeUtils.import("resource:///modules/LiveBookmarkMigrator.jsm");
const kTestData = {
guid: PlacesUtils.bookmarks.toolbarGuid,
children: [
{type: PlacesUtils.bookmarks.TYPE_BOOKMARK, title: "BM 1", url: new URL("https://example.com/1")},
{type: PlacesUtils.bookmarks.TYPE_FOLDER, title: "LB 1"},
{type: PlacesUtils.bookmarks.TYPE_BOOKMARK, title: "BM 2", url: new URL("https://example.com/2")},
{type: PlacesUtils.bookmarks.TYPE_FOLDER, title: "Regular old folder", children: [
@@ -91,17 +91,17 @@ add_task(async function check_fetches_li
"All of them should have a feed URI");
info(JSON.stringify(detectedLiveBookmarks));
Assert.deepEqual(detectedLiveBookmarks.map(bm => bm.index), [8, 7, 6, 4, 2, 1, 0],
"Should have sorted the items correctly.");
});
// Test that we write sane OPML for some live bookmarks.
add_task(async function check_opml_writing() {
- let bsPass = ChromeUtils.import("resource:///modules/LiveBookmarkMigrator.jsm", {});
+ let bsPass = ChromeUtils.import("resource:///modules/LiveBookmarkMigrator.jsm", null);
let oldFile = bsPass.OS.File;
registerCleanupFunction(() => { bsPass.OS.File = oldFile; });
let lastWriteArgs = null;
bsPass.OS.File = {
writeAtomic() {
lastWriteArgs = Array.from(arguments);
},
diff --git browser/modules/test/unit/test_Sanitizer_interrupted.js browser/modules/test/unit/test_Sanitizer_interrupted.js
--- browser/modules/test/unit/test_Sanitizer_interrupted.js
+++ browser/modules/test/unit/test_Sanitizer_interrupted.js
@@ -1,21 +1,21 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
do_get_profile();
// Test that interrupted sanitizations are properly tracked.
add_task(async function() {
- ChromeUtils.import("resource:///modules/Sanitizer.jsm");
+ const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm");
Services.prefs.setBoolPref(Sanitizer.PREF_NEWTAB_SEGREGATION, false);
registerCleanupFunction(() => {
Services.prefs.clearUserPref(Sanitizer.PREF_SANITIZE_ON_SHUTDOWN);
Services.prefs.clearUserPref(Sanitizer.PREF_SHUTDOWN_BRANCH + "formdata");
Services.prefs.clearUserPref(Sanitizer.PREF_NEWTAB_SEGREGATION);
});
diff --git browser/modules/test/unit/test_SitePermissions.js browser/modules/test/unit/test_SitePermissions.js
--- browser/modules/test/unit/test_SitePermissions.js
+++ browser/modules/test/unit/test_SitePermissions.js
@@ -1,15 +1,15 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
"use strict";
-ChromeUtils.import("resource:///modules/SitePermissions.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {SitePermissions} = ChromeUtils.import("resource:///modules/SitePermissions.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const RESIST_FINGERPRINTING_ENABLED = Services.prefs.getBoolPref("privacy.resistFingerprinting");
const MIDI_ENABLED = Services.prefs.getBoolPref("dom.webmidi.enabled");
add_task(async function testPermissionsListing() {
let expectedPermissions = ["autoplay-media", "camera", "cookie", "desktop-notification", "focus-tab-by-prompt",
"geo", "image", "install", "microphone", "plugin:flash", "popup", "screen", "shortcuts",
"persistent-storage", "storage-access"];
diff --git browser/modules/test/unit/test_discovery.js browser/modules/test/unit/test_discovery.js
--- browser/modules/test/unit/test_discovery.js
+++ browser/modules/test/unit/test_discovery.js
@@ -3,21 +3,21 @@
*/
/* globals ChromeUtils, Assert, add_task */
"use strict";
// ClientID fails without...
do_get_profile();
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://testing-common/TestUtils.jsm");
-ChromeUtils.import("resource://gre/modules/ClientID.jsm");
-ChromeUtils.import("resource:///modules/Discovery.jsm");
-ChromeUtils.import("resource://gre/modules/ContextualIdentityService.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {TestUtils} = ChromeUtils.import("resource://testing-common/TestUtils.jsm");
+const {ClientID} = ChromeUtils.import("resource://gre/modules/ClientID.jsm");
+const {Discovery} = ChromeUtils.import("resource:///modules/Discovery.jsm");
+const {ContextualIdentityService} = ChromeUtils.import("resource://gre/modules/ContextualIdentityService.jsm");
const TAAR_COOKIE_NAME = "taarId";
add_task(async function test_discovery() {
let uri = Services.io.newURI("https://example.com/foobar");
// Ensure the prefs we need
Services.prefs.setBoolPref("browser.discovery.enabled", true);
diff --git browser/modules/webrtcUI.jsm browser/modules/webrtcUI.jsm
--- browser/modules/webrtcUI.jsm
+++ browser/modules/webrtcUI.jsm
@@ -1,19 +1,19 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["webrtcUI"];
-ChromeUtils.import("resource:///modules/syncedtabs/EventEmitter.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {EventEmitter} = ChromeUtils.import("resource:///modules/syncedtabs/EventEmitter.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm");
ChromeUtils.defineModuleGetter(this, "PluralForm",
"resource://gre/modules/PluralForm.jsm");
ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
ChromeUtils.defineModuleGetter(this, "SitePermissions",
diff --git browser/tools/mozscreenshots/devtools/browser_devtools.js browser/tools/mozscreenshots/devtools/browser_devtools.js
--- browser/tools/mozscreenshots/devtools/browser_devtools.js
+++ browser/tools/mozscreenshots/devtools/browser_devtools.js
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* import-globals-from ../head.js */
"use strict";
-const {gDevTools} = ChromeUtils.import("resource://devtools/client/framework/gDevTools.jsm", {});
-const {devtools: {TargetFactory}} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {gDevTools} = ChromeUtils.import("resource://devtools/client/framework/gDevTools.jsm");
+const {devtools: {TargetFactory}} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
add_task(async function capture() {
if (!shouldCapture()) {
return;
}
let sets = ["DevTools"];
await TestRunner.start(sets, "devtools");
diff --git browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm
--- browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm
+++ browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm
@@ -1,20 +1,20 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["Screenshot"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/osfile.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
// Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref.
// See LOG_LEVELS in Console.jsm. Common examples: "All", "Info", "Warn", & "Error".
const PREF_LOG_LEVEL = "extensions.mozscreenshots@mozilla.org.loglevel";
XPCOMUtils.defineLazyGetter(this, "log", () => {
let ConsoleAPI = ChromeUtils.import("resource://gre/modules/Console.jsm", {}).ConsoleAPI;
let consoleOptions = {
maxLogLevel: "info",
diff --git browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
--- browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
+++ browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
@@ -5,22 +5,22 @@
"use strict";
var EXPORTED_SYMBOLS = ["TestRunner"];
const env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
const APPLY_CONFIG_TIMEOUT_MS = 60 * 1000;
const HOME_PAGE = "resource://mozscreenshots/lib/mozscreenshots.html";
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
-ChromeUtils.import("resource://gre/modules/osfile.jsm");
-ChromeUtils.import("resource://gre/modules/Geometry.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
+const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
+const {Rect} = ChromeUtils.import("resource://gre/modules/Geometry.jsm");
ChromeUtils.defineModuleGetter(this, "BrowserTestUtils",
"resource://testing-common/BrowserTestUtils.jsm");
// Screenshot.jsm must be imported this way for xpcshell tests to work
ChromeUtils.defineModuleGetter(this, "Screenshot", "resource://mozscreenshots/Screenshot.jsm");
var TestRunner = {
combos: null,
diff --git browser/tools/mozscreenshots/mozscreenshots/extension/api.js browser/tools/mozscreenshots/mozscreenshots/extension/api.js
--- browser/tools/mozscreenshots/mozscreenshots/extension/api.js
+++ browser/tools/mozscreenshots/mozscreenshots/extension/api.js
@@ -1,24 +1,24 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
/* globals ExtensionAPI */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "resProto",
"@mozilla.org/network/protocol;1?name=resource",
"nsISubstitutingProtocolHandler");
this.mozscreenshots = class extends ExtensionAPI {
async onStartup() {
let uri = Services.io.newURI("resources/", null, this.extension.rootURI);
resProto.setSubstitution("mozscreenshots", uri);
- ChromeUtils.import("resource://mozscreenshots/TestRunner.jsm");
+ const {TestRunner} = ChromeUtils.import("resource://mozscreenshots/TestRunner.jsm");
TestRunner.init(this.extension.rootURI);
}
};
diff --git browser/tools/mozscreenshots/mozscreenshots/extension/configurations/AppMenu.jsm browser/tools/mozscreenshots/mozscreenshots/extension/configurations/AppMenu.jsm
--- browser/tools/mozscreenshots/mozscreenshots/extension/configurations/AppMenu.jsm
+++ browser/tools/mozscreenshots/mozscreenshots/extension/configurations/AppMenu.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["AppMenu"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {BrowserTestUtils} = ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
var AppMenu = {
init(libDir) {},
configurations: {
appMenuMainView: {
selectors: ["#appMenu-popup"],
diff --git browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Buttons.jsm browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Buttons.jsm
--- browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Buttons.jsm
+++ browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Buttons.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["Buttons"];
-ChromeUtils.import("resource:///modules/CustomizableUI.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {CustomizableUI} = ChromeUtils.import("resource:///modules/CustomizableUI.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var Buttons = {
init(libDir) {
createWidget();
},
configurations: {
diff --git browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
--- browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
+++ browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
@@ -1,24 +1,24 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["ControlCenter"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
-ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
-ChromeUtils.import("resource:///modules/SitePermissions.jsm");
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
+const {BrowserTestUtils} = ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
+const {SitePermissions} = ChromeUtils.import("resource:///modules/SitePermissions.jsm");
+const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-let {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
+let {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm");
const RESOURCE_PATH = "browser/browser/tools/mozscreenshots/mozscreenshots/extension/mozscreenshots/browser/resources/lib/controlCenter";
const HTTP_PAGE = "http://example.com/";
const HTTPS_PAGE = "https://example.com/";
const PERMISSIONS_PAGE = "https://test1.example.com/";
const HTTP_PASSWORD_PAGE = `http://test2.example.org/${RESOURCE_PATH}/password.html`;
const MIXED_CONTENT_URL = `https://example.com/${RESOURCE_PATH}/mixed.html`;
const MIXED_ACTIVE_CONTENT_URL = `https://example.com/${RESOURCE_PATH}/mixed_active.html`;
diff --git browser/tools/mozscreenshots/mozscreenshots/extension/configurations/CustomizeMode.jsm browser/tools/mozscreenshots/mozscreenshots/extension/configurations/CustomizeMode.jsm
--- browser/tools/mozscreenshots/mozscreenshots/extension/configurations/CustomizeMode.jsm
+++ browser/tools/mozscreenshots/mozscreenshots/extension/configurations/CustomizeMode.jsm
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["CustomizeMode"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
var CustomizeMode = {
init(libDir) {},
configurations: {
notCustomizing: {
selectors: ["#navigator-toolbox"],
diff --git browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.jsm browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.jsm
--- browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.jsm
+++ browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.jsm
@@ -1,21 +1,21 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["DevTools"];
-ChromeUtils.import("resource://devtools/client/framework/gDevTools.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
+const {gDevTools} = ChromeUtils.import("resource://devtools/client/framework/gDevTools.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
-let { devtools } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+let { devtools } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
let TargetFactory = devtools.TargetFactory;
async function getTargetForSelectedTab() {
let browserWindow = Services.wm.getMostRecentWindow("navigator:browser");
let target = await TargetFactory.forTab(browserWindow.gBrowser.selectedTab);
return target;
}
diff --git browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.jsm browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.jsm
--- browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.jsm
+++ browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.jsm
@@ -1,19 +1,19 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["LightweightThemes"];
-ChromeUtils.import("resource://gre/modules/LightweightThemeManager.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
+const {LightweightThemeManager} = ChromeUtils.import("resource://gre/modules/LightweightThemeManager.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
var LightweightThemes = {
init(libDir) {
// convert -size 3000x200 canvas:#333 black_theme.png
let blackImage = libDir.clone();
blackImage.append("black_theme.png");
this._blackImageURL = Services.io.newFileURI(blackImage).spec;
diff --git browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
--- browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
+++ browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
@@ -1,20 +1,20 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["PermissionPrompts"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/E10SUtils.jsm");
-ChromeUtils.import("resource://testing-common/ContentTask.jsm");
-ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {E10SUtils} = ChromeUtils.import("resource://gre/modules/E10SUtils.jsm");
+const {ContentTask} = ChromeUtils.import("resource://testing-common/ContentTask.jsm");
+const {BrowserTestUtils} = ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
const URL = "https://test1.example.com/browser/browser/tools/mozscreenshots/mozscreenshots/extension/mozscreenshots/browser/resources/lib/permissionPrompts.html";
let lastTab = null;
var PermissionPrompts = {
init(libDir) {
Services.prefs.setBoolPref("media.navigator.permission.fake", true);
Services.prefs.setBoolPref("extensions.install.requireBuiltInCerts", false);
diff --git browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
--- browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
+++ browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
@@ -1,19 +1,19 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["Preferences"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://testing-common/TestUtils.jsm");
-ChromeUtils.import("resource://testing-common/ContentTask.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {TestUtils} = ChromeUtils.import("resource://testing-common/TestUtils.jsm");
+const {ContentTask} = ChromeUtils.import("resource://testing-common/ContentTask.jsm");
var Preferences = {
init(libDir) {
let panes = [
["paneGeneral"],
["paneGeneral", browsingGroup],
["paneGeneral", connectionDialog],
diff --git browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm
--- browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm
+++ browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm
@@ -5,21 +5,21 @@
"use strict";
var EXPORTED_SYMBOLS = ["Tabs"];
const CUST_TAB = "chrome://browser/skin/customize.svg";
const PREFS_TAB = "chrome://browser/skin/settings.svg";
const DEFAULT_FAVICON_TAB = `data:text/html,<meta%20charset="utf-8"><title>No%20favicon</title>`;
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://testing-common/TestUtils.jsm");
-ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {TestUtils} = ChromeUtils.import("resource://testing-common/TestUtils.jsm");
+const {BrowserTestUtils} = ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
XPCOMUtils.defineLazyGlobalGetters(this, ["InspectorUtils"]);
var Tabs = {
init(libDir) {},
configurations: {
fiveTabs: {
diff --git browser/tools/mozscreenshots/mozscreenshots/extension/configurations/TabsInTitlebar.jsm browser/tools/mozscreenshots/mozscreenshots/extension/configurations/TabsInTitlebar.jsm
--- browser/tools/mozscreenshots/mozscreenshots/extension/configurations/TabsInTitlebar.jsm
+++ browser/tools/mozscreenshots/mozscreenshots/extension/configurations/TabsInTitlebar.jsm
@@ -3,17 +3,17 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["TabsInTitlebar"];
const PREF_TABS_IN_TITLEBAR = "browser.tabs.drawInTitlebar";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var TabsInTitlebar = {
init(libDir) {},
configurations: {
tabsInTitlebar: {
selectors: ["#navigator-toolbox"],
diff --git browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.jsm browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.jsm
--- browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.jsm
+++ browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["Toolbars"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var Toolbars = {
init(libDir) {},
configurations: {
onlyNavBar: {
selectors: ["#navigator-toolbox"],
async applyConfig() {
diff --git browser/tools/mozscreenshots/mozscreenshots/extension/configurations/UIDensities.jsm browser/tools/mozscreenshots/mozscreenshots/extension/configurations/UIDensities.jsm
--- browser/tools/mozscreenshots/mozscreenshots/extension/configurations/UIDensities.jsm
+++ browser/tools/mozscreenshots/mozscreenshots/extension/configurations/UIDensities.jsm
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["UIDensities"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var UIDensities = {
init(libDir) {},
configurations: {
compactDensity: {
selectors: ["#navigator-toolbox, #appMenu-popup, #widget-overflow"],
diff --git browser/tools/mozscreenshots/mozscreenshots/extension/configurations/WindowSize.jsm browser/tools/mozscreenshots/mozscreenshots/extension/configurations/WindowSize.jsm
--- browser/tools/mozscreenshots/mozscreenshots/extension/configurations/WindowSize.jsm
+++ browser/tools/mozscreenshots/mozscreenshots/extension/configurations/WindowSize.jsm
@@ -1,19 +1,19 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["WindowSize"];
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
-ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
+const {BrowserTestUtils} = ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
var WindowSize = {
init(libDir) {
Services.prefs.setBoolPref("browser.fullscreen.autohide", false);
},
configurations: {
diff --git browser/tools/mozscreenshots/tests/xpcshell/test_testConfigurations.js browser/tools/mozscreenshots/tests/xpcshell/test_testConfigurations.js
--- browser/tools/mozscreenshots/tests/xpcshell/test_testConfigurations.js
+++ browser/tools/mozscreenshots/tests/xpcshell/test_testConfigurations.js
@@ -1,15 +1,15 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
"use strict";
-ChromeUtils.import("resource://test/TestRunner.jsm");
+const {TestRunner} = ChromeUtils.import("resource://test/TestRunner.jsm");
add_task(async function capture() {
equal(TestRunner.findComma("Toolbars,Devs"), 8);
equal(TestRunner.findComma("Toolbars"), -1);
equal(TestRunner.findComma("Toolbars[onlyNavBar,allToolbars],DevTools"), 32);
equal(TestRunner.findComma("Toolbars[onlyNavBar,allToolbars],DevTools[bottomToolbox,sideToolbox]"), 32);
equal(TestRunner.findComma("Toolbars[[onlyNavBar],[]], Tabs[ [fiveTabbed], [[[fourPinned]]] ]"), 25);
equal(TestRunner.findComma("[[[[[[[[[[[[[[[[[[[[]]"), -1);
diff --git caps/tests/mochitest/test_bug995943.xul caps/tests/mochitest/test_bug995943.xul
--- caps/tests/mochitest/test_bug995943.xul
+++ caps/tests/mochitest/test_bug995943.xul
@@ -12,17 +12,17 @@ https://bugzilla.mozilla.org/show_bug.cg
<body xmlns="http://www.w3.org/1999/xhtml">
<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=995943"
target="_blank">Mozilla Bug 995943</a>
</body>
<!-- test code goes here -->
<script type="application/javascript">
<![CDATA[
- ChromeUtils.import("resource://gre/modules/Services.jsm");
+ const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
function debug(msg) { info(msg); }
/** Test for CAPS file:// URI prefs. **/
SimpleTest.waitForExplicitFinish();
SimpleTest.requestCompleteLog();
if (navigator.userAgent.includes("Mac OS X 10.10"))
SimpleTest.expectAssertions(5, 11); // See bug 1067022, 1307988
else if (Services.appinfo.OS == "WINNT")
diff --git caps/tests/mochitest/test_disableScript.xul caps/tests/mochitest/test_disableScript.xul
--- caps/tests/mochitest/test_disableScript.xul
+++ caps/tests/mochitest/test_disableScript.xul
@@ -19,17 +19,17 @@ https://bugzilla.mozilla.org/show_bug.cg
<!-- test code goes here -->
<script type="application/javascript">
<![CDATA[
/** Test for all the different ways that script can be disabled for a given global. **/
SimpleTest.waitForExplicitFinish();
- ChromeUtils.import("resource://gre/modules/Services.jsm");
+ const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const ssm = Services.scriptSecurityManager;
function makeURI(uri) { return Services.io.newURI(uri); }
const path = "/tests/caps/tests/mochitest/file_disableScript.html";
const uri = "http://www.example.com" + path;
var rootFrame = document.getElementById('root');
var chromeFrame = document.getElementById('chromeFrame');
navigateFrame(rootFrame, uri + "?name=rootframe").then(function() {
navigateFrame(chromeFrame, "file_disableScript.html").then(go);
diff --git caps/tests/unit/test_origin.js caps/tests/unit/test_origin.js
--- caps/tests/unit/test_origin.js
+++ caps/tests/unit/test_origin.js
@@ -1,9 +1,9 @@
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var ssm = Services.scriptSecurityManager;
function makeURI(uri) { return Services.io.newURI(uri); }
function checkThrows(f) {
var threw = false;
try { f(); } catch (e) { threw = true; }
Assert.ok(threw);
}
diff --git chrome/test/unit/head_crtestutils.js chrome/test/unit/head_crtestutils.js
--- chrome/test/unit/head_crtestutils.js
+++ chrome/test/unit/head_crtestutils.js
@@ -1,10 +1,10 @@
const XULAPPINFO_CONTRACTID = "@mozilla.org/xre/app-info;1";
const XULAPPINFO_CID = Components.ID("{4ba645d3-be6f-40d6-a42a-01b2f40091b8}");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
function registerManifests(manifests) {
var reg = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
for (var manifest of manifests)
reg.autoRegister(manifest);
}
diff --git chrome/test/unit/test_bug848297.js chrome/test/unit/test_bug848297.js
--- chrome/test/unit/test_bug848297.js
+++ chrome/test/unit/test_bug848297.js
@@ -3,17 +3,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
var MANIFESTS = [
do_get_file("data/test_bug848297.manifest"),
];
// Stub in the locale service so we can control what gets returned as the OS locale setting
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
registerManifests(MANIFESTS);
var chromeReg = Cc["@mozilla.org/chrome/chrome-registry;1"]
.getService(Ci.nsIXULChromeRegistry)
.QueryInterface(Ci.nsIToolkitChromeRegistry);
chromeReg.checkForNewChrome();
diff --git devtools/client/aboutdebugging-new/initializer.js devtools/client/aboutdebugging-new/initializer.js
--- devtools/client/aboutdebugging-new/initializer.js
+++ devtools/client/aboutdebugging-new/initializer.js
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const { BrowserLoader } =
- ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
+ ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
const { require } = BrowserLoader({
baseURI: "resource://devtools/client/aboutdebugging-new/",
window,
});
// The only purpose of this module is to load the real aboutdebugging module via the
// BrowserLoader.
// This cannot be done using an inline script tag in index.html because we are applying
diff --git devtools/client/aboutdebugging-new/test/browser/helper-addons.js devtools/client/aboutdebugging-new/test/browser/helper-addons.js
--- devtools/client/aboutdebugging-new/test/browser/helper-addons.js
+++ devtools/client/aboutdebugging-new/test/browser/helper-addons.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
/* import-globals-from head.js */
-const { Management } = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+const { Management } = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
function _getSupportsFile(path) {
const cr = Cc["@mozilla.org/chrome/chrome-registry;1"]
.getService(Ci.nsIChromeRegistry);
const uri = Services.io.newURI(CHROME_URL_ROOT + path);
const fileurl = cr.convertChromeURL(uri);
return fileurl.QueryInterface(Ci.nsIFileURL);
}
diff --git devtools/client/aboutdebugging-new/test/unit/xpcshell-head.js devtools/client/aboutdebugging-new/test/unit/xpcshell-head.js
--- devtools/client/aboutdebugging-new/test/unit/xpcshell-head.js
+++ devtools/client/aboutdebugging-new/test/unit/xpcshell-head.js
@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
/* eslint no-unused-vars: [2, {"vars": "local"}] */
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
diff --git devtools/client/aboutdebugging/initializer.js devtools/client/aboutdebugging/initializer.js
--- devtools/client/aboutdebugging/initializer.js
+++ devtools/client/aboutdebugging/initializer.js
@@ -2,22 +2,19 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* eslint-env browser */
/* globals Telemetry */
"use strict";
-const { loader } = ChromeUtils.import(
- "resource://devtools/shared/Loader.jsm", {});
-const { BrowserLoader } = ChromeUtils.import(
- "resource://devtools/client/shared/browser-loader.js", {});
-const { Services } = ChromeUtils.import(
- "resource://gre/modules/Services.jsm", {});
+const { loader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
+const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
loader.lazyRequireGetter(this, "Telemetry",
"devtools/client/shared/telemetry");
const { require } = BrowserLoader({
baseURI: "resource://devtools/client/aboutdebugging/",
window,
});
diff --git devtools/client/aboutdebugging/test/browser_addons_debug_info.js devtools/client/aboutdebugging/test/browser_addons_debug_info.js
--- devtools/client/aboutdebugging/test/browser_addons_debug_info.js
+++ devtools/client/aboutdebugging/test/browser_addons_debug_info.js
@@ -1,11 +1,11 @@
"use strict";
-const { Preferences } = ChromeUtils.import("resource://gre/modules/Preferences.jsm", {});
+const { Preferences } = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
const UUID_REGEX = /^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$/;
const SHOW_SYSTEM_ADDONS_PREF = "devtools.aboutdebugging.showSystemAddons";
function testFilePath(container, expectedFilePath) {
// Verify that the path to the install location is shown next to its label.
const filePath = container.querySelector(".file-path");
ok(filePath, "file path is in DOM");
diff --git devtools/client/aboutdebugging/test/browser_addons_debug_webextension.js devtools/client/aboutdebugging/test/browser_addons_debug_webextension.js
--- devtools/client/aboutdebugging/test/browser_addons_debug_webextension.js
+++ devtools/client/aboutdebugging/test/browser_addons_debug_webextension.js
@@ -11,17 +11,17 @@ PromiseTestUtils.whitelistRejectionsGlob
// Avoid test timeouts that can occur while waiting for the "addon-console-works" message.
requestLongerTimeout(2);
const ADDON_ID = "test-devtools-webextension@mozilla.org";
const ADDON_NAME = "test-devtools-webextension";
const {
BrowserToolboxProcess,
-} = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
+} = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm");
/**
* This test file ensures that the webextension addon developer toolbox:
* - when the debug button is clicked on a webextension, the opened toolbox
* has a working webconsole with the background page as default target;
*/
add_task(async function testWebExtensionsToolboxWebConsole() {
const addonFile = ExtensionTestCommon.generateXPI({
diff --git devtools/client/aboutdebugging/test/browser_addons_debug_webextension_inspector.js devtools/client/aboutdebugging/test/browser_addons_debug_webextension_inspector.js
--- devtools/client/aboutdebugging/test/browser_addons_debug_webextension_inspector.js
+++ devtools/client/aboutdebugging/test/browser_addons_debug_webextension_inspector.js
@@ -10,17 +10,17 @@ PromiseTestUtils.whitelistRejectionsGlob
// Avoid test timeouts that can occur while waiting for the "addon-console-works" message.
requestLongerTimeout(2);
const ADDON_ID = "test-devtools-webextension@mozilla.org";
const ADDON_NAME = "test-devtools-webextension";
const {
BrowserToolboxProcess,
-} = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
+} = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm");
/**
* This test file ensures that the webextension addon developer toolbox:
* - the webextension developer toolbox has a working Inspector panel, with the
* background page as default target;
*/
add_task(async function testWebExtensionsToolboxInspector() {
const addonFile = ExtensionTestCommon.generateXPI({
diff --git devtools/client/aboutdebugging/test/browser_addons_debug_webextension_nobg.js devtools/client/aboutdebugging/test/browser_addons_debug_webextension_nobg.js
--- devtools/client/aboutdebugging/test/browser_addons_debug_webextension_nobg.js
+++ devtools/client/aboutdebugging/test/browser_addons_debug_webextension_nobg.js
@@ -10,17 +10,17 @@ PromiseTestUtils.whitelistRejectionsGlob
// Avoid test timeouts that can occur while waiting for the "addon-console-works" message.
requestLongerTimeout(2);
const ADDON_NOBG_ID = "test-devtools-webextension-nobg@mozilla.org";
const ADDON_NOBG_NAME = "test-devtools-webextension-nobg";
const {
BrowserToolboxProcess,
-} = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
+} = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm");
/**
* This test file ensures that the webextension addon developer toolbox:
* - the webextension developer toolbox is connected to a fallback page when the
* background page is not available (and in the fallback page document body contains
* the expected message, which warns the user that the current page is not a real
* webextension context);
*/
diff --git devtools/client/aboutdebugging/test/browser_addons_debug_webextension_popup.js devtools/client/aboutdebugging/test/browser_addons_debug_webextension_popup.js
--- devtools/client/aboutdebugging/test/browser_addons_debug_webextension_popup.js
+++ devtools/client/aboutdebugging/test/browser_addons_debug_webextension_popup.js
@@ -10,17 +10,17 @@ PromiseTestUtils.whitelistRejectionsGlob
// Avoid test timeouts that can occur while waiting for the "addon-console-works" message.
requestLongerTimeout(2);
const ADDON_ID = "test-devtools-webextension@mozilla.org";
const ADDON_NAME = "test-devtools-webextension";
const {
BrowserToolboxProcess,
-} = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
+} = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm");
/**
* This test file ensures that the webextension addon developer toolbox:
* - when the debug button is clicked on a webextension, the opened toolbox
* has a working webconsole with the background page as default target;
* - the webextension developer toolbox has a working Inspector panel, with the
* background page as default target;
* - the webextension developer toolbox is connected to a fallback page when the
diff --git devtools/client/aboutdebugging/test/head.js devtools/client/aboutdebugging/test/head.js
--- devtools/client/aboutdebugging/test/head.js
+++ devtools/client/aboutdebugging/test/head.js
@@ -7,19 +7,19 @@
"use strict";
// Load the shared-head file first.
Services.scriptloader.loadSubScript(
"chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
this);
-const { AddonManager } = ChromeUtils.import("resource://gre/modules/AddonManager.jsm", {});
-const { Management } = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
-const { ExtensionTestCommon } = ChromeUtils.import("resource://testing-common/ExtensionTestCommon.jsm", {});
+const { AddonManager } = ChromeUtils.import("resource://gre/modules/AddonManager.jsm");
+const { Management } = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
+const { ExtensionTestCommon } = ChromeUtils.import("resource://testing-common/ExtensionTestCommon.jsm");
async function openAboutDebugging(page, win) {
info("opening about:debugging");
let url = "about:debugging";
if (page) {
url += "#" + page;
}
diff --git devtools/client/accessibility/test/mochitest/head.js devtools/client/accessibility/test/mochitest/head.js
--- devtools/client/accessibility/test/mochitest/head.js
+++ devtools/client/accessibility/test/mochitest/head.js
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* eslint no-unused-vars: [2, {"vars": "local"}] */
"use strict";
-var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
-var { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
+var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
+var { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
var DevToolsUtils = require("devtools/shared/DevToolsUtils");
var { require: browserRequire } = BrowserLoader({
baseURI: "resource://devtools/client/shared/",
window,
});
window.EVENTS = {};
diff --git devtools/client/application/initializer.js devtools/client/application/initializer.js
--- devtools/client/application/initializer.js
+++ devtools/client/application/initializer.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
+const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
const require = BrowserLoader({
baseURI: "resource://devtools/client/application/",
window,
}).require;
const { createFactory } = require("devtools/client/shared/vendor/react");
const { render, unmountComponentAtNode } = require("devtools/client/shared/vendor/react-dom");
const Provider = createFactory(require("devtools/client/shared/vendor/react-redux").Provider);
diff --git devtools/client/canvasdebugger/canvasdebugger.js devtools/client/canvasdebugger/canvasdebugger.js
--- devtools/client/canvasdebugger/canvasdebugger.js
+++ devtools/client/canvasdebugger/canvasdebugger.js
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
const { SideMenuWidget } = require("resource://devtools/client/shared/widgets/SideMenuWidget.jsm");
const Services = require("Services");
const EventEmitter = require("devtools/shared/event-emitter");
const { CanvasFront } = require("devtools/shared/fronts/canvas");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
const { extend } = require("devtools/shared/extend");
const flags = require("devtools/shared/flags");
diff --git devtools/client/debugger/new/index.html devtools/client/debugger/new/index.html
--- devtools/client/debugger/new/index.html
+++ devtools/client/debugger/new/index.html
@@ -10,17 +10,17 @@
<link rel="stylesheet" type="text/css" href="chrome://devtools/content/sourceeditor/codemirror/mozilla.css" />
<link rel="stylesheet" type="text/css" href="resource://devtools/client/debugger/new/dist/debugger.css" />
</head>
<body>
<div id="mount"></div>
<script type="application/javascript" src="chrome://devtools/content/shared/theme-switching.js"></script>
<script type="text/javascript">
- const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
+ const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
const { require } = BrowserLoader({
baseURI: "resource://devtools/client/debugger/new",
window,
});
Debugger = require("devtools/client/debugger/new/src/main");
</script>
</body>
diff --git devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-create.js devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-create.js
--- devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-create.js
+++ devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-create.js
@@ -12,20 +12,17 @@
const { PromiseTestUtils } = scopedCuImport(
"resource://testing-common/PromiseTestUtils.jsm"
);
PromiseTestUtils.whitelistRejectionsGlobally(/File closed/);
PromiseTestUtils.whitelistRejectionsGlobally(/NS_ERROR_FAILURE/);
requestLongerTimeout(5);
-const { BrowserToolboxProcess } = ChromeUtils.import(
- "resource://devtools/client/framework/ToolboxProcess.jsm",
- {}
-);
+const { BrowserToolboxProcess } = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm");
let gProcess = undefined;
function initChromeDebugger() {
info("Initializing a chrome debugger process.");
return new Promise(resolve => {
BrowserToolboxProcess.init(onClose, _process => {
info("Browser toolbox process started successfully.");
resolve(_process);
diff --git devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-debugging.js devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-debugging.js
--- devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-debugging.js
+++ devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-debugging.js
@@ -5,20 +5,17 @@
/**
* Tests that chrome debugging works.
*/
var gClient, gThreadClient;
var gNewChromeSource = promise.defer();
-var { DevToolsLoader } = ChromeUtils.import(
- "resource://devtools/shared/Loader.jsm",
- {}
-);
+var { DevToolsLoader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
var customLoader = new DevToolsLoader();
customLoader.invisibleToDebugger = true;
var { DebuggerServer } = customLoader.require("devtools/server/main");
var { DebuggerClient } = require("devtools/shared/client/debugger-client");
function initDebuggerClient() {
DebuggerServer.init();
DebuggerServer.registerAllActors();
diff --git devtools/client/dom/main.js devtools/client/dom/main.js
--- devtools/client/dom/main.js
+++ devtools/client/dom/main.js
@@ -1,17 +1,17 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", {});
-const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
+const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
// Module Loader
const require = BrowserLoader({
baseURI: "resource://devtools/client/dom/",
window,
}).require;
XPCOMUtils.defineConstant(this, "require", require);
diff --git devtools/client/framework/ToolboxProcess.jsm devtools/client/framework/ToolboxProcess.jsm
--- devtools/client/framework/ToolboxProcess.jsm
+++ devtools/client/framework/ToolboxProcess.jsm
@@ -4,17 +4,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const DBG_XUL = "chrome://devtools/content/framework/toolbox-process-window.html";
const CHROME_DEBUGGER_PROFILE_NAME = "chrome_debugger_profile";
-const { require, DevToolsLoader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require, DevToolsLoader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Subprocess", "resource://gre/modules/Subprocess.jsm");
ChromeUtils.defineModuleGetter(this, "AppConstants", "resource://gre/modules/AppConstants.jsm");
XPCOMUtils.defineLazyGetter(this, "Telemetry", function() {
return require("devtools/client/shared/telemetry");
});
diff --git devtools/client/framework/connect/connect.js devtools/client/framework/connect/connect.js
--- devtools/client/framework/connect/connect.js
+++ devtools/client/framework/connect/connect.js
@@ -1,17 +1,17 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
var Services = require("Services");
var {gDevTools} = require("devtools/client/framework/devtools");
var {TargetFactory} = require("devtools/client/framework/target");
var {Toolbox} = require("devtools/client/framework/toolbox");
var {DebuggerClient} = require("devtools/shared/client/debugger-client");
var {LocalizationHelper} = require("devtools/shared/l10n");
var L10N = new LocalizationHelper("devtools/client/locales/connection-screen.properties");
diff --git devtools/client/framework/gDevTools.jsm devtools/client/framework/gDevTools.jsm
--- devtools/client/framework/gDevTools.jsm
+++ devtools/client/framework/gDevTools.jsm
@@ -18,17 +18,17 @@ this.EXPORTED_SYMBOLS = [ "gDevTools", "
/**
* Do not directly map to the commonjs modules so that callsites of
* gDevTools.jsm do not have to do anything to access to the very last version
* of the module. The `devtools` and `browser` getter are always going to
* retrieve the very last version of the modules.
*/
Object.defineProperty(this, "require", {
get() {
- const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
return require;
},
});
Object.defineProperty(this, "devtools", {
get() {
return require("devtools/client/framework/devtools").gDevTools;
},
});
diff --git devtools/client/framework/test/browser_browser_toolbox.js devtools/client/framework/test/browser_browser_toolbox.js
--- devtools/client/framework/test/browser_browser_toolbox.js
+++ devtools/client/framework/test/browser_browser_toolbox.js
@@ -51,17 +51,17 @@ add_task(async function() {
})
.then(() => toolbox.destroy());
};
env.set("MOZ_TOOLBOX_TEST_SCRIPT", "new " + testScript);
registerCleanupFunction(() => {
env.set("MOZ_TOOLBOX_TEST_SCRIPT", "");
});
- const { BrowserToolboxProcess } = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
+ const { BrowserToolboxProcess } = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm");
is(BrowserToolboxProcess.getBrowserToolboxSessionState(), false, "No session state initially");
let closePromise;
await new Promise(onRun => {
closePromise = new Promise(onClose => {
info("Opening the browser toolbox\n");
BrowserToolboxProcess.init(onClose, onRun);
});
diff --git devtools/client/framework/test/browser_browser_toolbox_debugger.js devtools/client/framework/test/browser_browser_toolbox_debugger.js
--- devtools/client/framework/test/browser_browser_toolbox_debugger.js
+++ devtools/client/framework/test/browser_browser_toolbox_debugger.js
@@ -94,23 +94,23 @@ add_task(async function runTest() {
} else {
msg = "SUCCESS: " + msg;
dump(msg + "\n");
}
};
const registerCleanupFunction = () => {};
- const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
- const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
+ const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
+ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Copied from shared-head.js:
// test_browser_toolbox_debugger.js uses waitForPaused, which relies on waitUntil
// which is normally provided by shared-head.js
- const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm", {});
+ const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
function waitUntil(predicate, interval = 10) {
if (predicate()) {
return Promise.resolve(true);
}
return new Promise(resolve => {
// TODO: fixme.
// eslint-disable-next-line mozilla/no-arbitrary-setTimeout
setTimeout(function() {
@@ -143,17 +143,17 @@ add_task(async function runTest() {
" dump('Exception: '+ e + ' at ' + e.fileName + ':' + " +
" e.lineNumber + '\\nStack: ' + e.stack + '\\n');" +
"}";
env.set("MOZ_TOOLBOX_TEST_SCRIPT", source);
registerCleanupFunction(() => {
env.set("MOZ_TOOLBOX_TEST_SCRIPT", "");
});
- const { BrowserToolboxProcess } = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
+ const { BrowserToolboxProcess } = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm");
// Use two promises, one for each BrowserToolboxProcess.init callback
// arguments, to ensure that we wait for toolbox run and close events.
let closePromise;
await new Promise(onRun => {
closePromise = new Promise(onClose => {
info("Opening the browser toolbox\n");
BrowserToolboxProcess.init(onClose, onRun);
});
diff --git devtools/client/framework/test/browser_target_from_url.js devtools/client/framework/test/browser_target_from_url.js
--- devtools/client/framework/test/browser_target_from_url.js
+++ devtools/client/framework/test/browser_target_from_url.js
@@ -1,15 +1,15 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
const TEST_URI = "data:text/html;charset=utf-8," +
"<p>browser_target-from-url.js</p>";
-const { DevToolsLoader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { DevToolsLoader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { targetFromURL } = require("devtools/client/framework/target-from-url");
Services.prefs.setBoolPref("devtools.debugger.remote-enabled", true);
Services.prefs.setBoolPref("devtools.debugger.prompt-connection", false);
SimpleTest.registerCleanupFunction(() => {
Services.prefs.clearUserPref("devtools.debugger.remote-enabled");
Services.prefs.clearUserPref("devtools.debugger.prompt-connection");
diff --git devtools/client/framework/test/unit/test_tabs_absolute_order.js devtools/client/framework/test/unit/test_tabs_absolute_order.js
--- devtools/client/framework/test/unit/test_tabs_absolute_order.js
+++ devtools/client/framework/test/unit/test_tabs_absolute_order.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const TEST_DATA = [
{
description: "Test for no order in preference",
preferenceOrder: [],
currentTabsOrder: ["T1", "T2", "T3", "T4", "T5"],
dragTarget: "T1",
expectedOrder: ["T1", "T2", "T3", "T4", "T5"],
diff --git devtools/client/framework/toolbox-init.js devtools/client/framework/toolbox-init.js
--- devtools/client/framework/toolbox-init.js
+++ devtools/client/framework/toolbox-init.js
@@ -8,17 +8,17 @@
"use strict";
// URL constructor doesn't support about: scheme
const href = window.location.href.replace("about:", "http://");
const url = new window.URL(href);
// Only use this method to attach the toolbox if some query parameters are given
if (url.search.length > 1) {
- const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { gDevTools } = require("devtools/client/framework/devtools");
const { targetFromURL } = require("devtools/client/framework/target-from-url");
const { Toolbox } = require("devtools/client/framework/toolbox");
const { TargetFactory } = require("devtools/client/framework/target");
const { DebuggerServer } = require("devtools/server/main");
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
// `host` is the frame element loading the toolbox.
diff --git devtools/client/framework/toolbox-process-window.js devtools/client/framework/toolbox-process-window.js
--- devtools/client/framework/toolbox-process-window.js
+++ devtools/client/framework/toolbox-process-window.js
@@ -1,17 +1,17 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-var { loader, require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+var { loader, require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
// Require this module to setup core modules
loader.require("devtools/client/framework/devtools-browser");
var { gDevTools } = require("devtools/client/framework/devtools");
var { TargetFactory } = require("devtools/client/framework/target");
var { Toolbox } = require("devtools/client/framework/toolbox");
var Services = require("Services");
diff --git devtools/client/framework/toolbox.js devtools/client/framework/toolbox.js
--- devtools/client/framework/toolbox.js
+++ devtools/client/framework/toolbox.js
@@ -26,17 +26,17 @@ var Telemetry = require("devtools/client
const { getUnicodeUrl } = require("devtools/client/shared/unicode-url");
var { attachThread, detachThread } = require("./attach-thread");
var { DOMHelpers } = require("resource://devtools/client/shared/DOMHelpers.jsm");
const { KeyCodes } = require("devtools/client/shared/keycodes");
var Startup = Cc["@mozilla.org/devtools/startup-clh;1"].getService(Ci.nsISupports)
.wrappedJSObject;
const { BrowserLoader } =
- ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
+ ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
const {LocalizationHelper} = require("devtools/shared/l10n");
const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");
loader.lazyRequireGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm", true);
loader.lazyRequireGetter(this, "flags",
"devtools/shared/flags");
diff --git devtools/client/inspector/grids/test/unit/head.js devtools/client/inspector/grids/test/unit/head.js
--- devtools/client/inspector/grids/test/unit/head.js
+++ devtools/client/inspector/grids/test/unit/head.js
@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
/* eslint no-unused-vars: [2, {"vars": "local"}] */
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
diff --git devtools/client/jsonview/converter-observer.js devtools/client/jsonview/converter-observer.js
--- devtools/client/jsonview/converter-observer.js
+++ devtools/client/jsonview/converter-observer.js
@@ -3,23 +3,23 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const Cm = Components.manager;
-const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", {});
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Load devtools module lazily.
XPCOMUtils.defineLazyGetter(this, "devtools", function() {
// eslint-disable-next-line no-shadow
- const {devtools} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {devtools} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
return devtools;
});
// Load JsonView services lazily.
XPCOMUtils.defineLazyGetter(this, "JsonViewService", function() {
// eslint-disable-next-line no-shadow
const {JsonViewService} = devtools.require("devtools/client/jsonview/converter-child");
return JsonViewService;
diff --git devtools/client/memory/test/chrome/head.js devtools/client/memory/test/chrome/head.js
--- devtools/client/memory/test/chrome/head.js
+++ devtools/client/memory/test/chrome/head.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-var { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
+var { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
var { require } = BrowserLoader({
baseURI: "resource://devtools/client/memory/",
window,
});
var { Assert } = require("resource://testing-common/Assert.jsm");
var Services = require("Services");
var EXPECTED_DTU_ASSERT_FAILURE_COUNT = 0;
diff --git devtools/client/memory/test/unit/head.js devtools/client/memory/test/unit/head.js
--- devtools/client/memory/test/unit/head.js
+++ devtools/client/memory/test/unit/head.js
@@ -1,17 +1,17 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// via xpcshell.ini
/* import-globals-from ../../../shared/test/shared-redux-head.js */
-var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
var Services = require("Services");
var DevToolsUtils = require("devtools/shared/DevToolsUtils");
Services.prefs.setBoolPref("devtools.testing", true);
Services.prefs.setBoolPref("devtools.debugger.log", true);
registerCleanupFunction(() => {
Services.prefs.clearUserPref("devtools.testing");
diff --git devtools/client/netmonitor/initializer.js devtools/client/netmonitor/initializer.js
--- devtools/client/netmonitor/initializer.js
+++ devtools/client/netmonitor/initializer.js
@@ -4,18 +4,17 @@
/* exported initialize */
"use strict";
/**
* This script is the entry point of Network monitor panel.
* See README.md for more information.
*/
-const { BrowserLoader } = ChromeUtils.import(
- "resource://devtools/client/shared/browser-loader.js", {});
+const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
const require = window.windowRequire = BrowserLoader({
baseURI: "resource://devtools/client/netmonitor/",
window,
}).require;
const { NetMonitorAPI } = require("./src/api");
const { NetMonitorApp } = require("./src/app");
diff --git devtools/client/netmonitor/test/browser_net_tracking-resources.js devtools/client/netmonitor/test/browser_net_tracking-resources.js
--- devtools/client/netmonitor/test/browser_net_tracking-resources.js
+++ devtools/client/netmonitor/test/browser_net_tracking-resources.js
@@ -1,15 +1,15 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const { UrlClassifierTestUtils } =
- ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
+ ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm");
const TEST_URI = "http://example.com/browser/devtools/client/" +
"netmonitor/test/html_tracking-protection.html";
registerCleanupFunction(function() {
UrlClassifierTestUtils.cleanupTestTrackers();
});
diff --git devtools/client/netmonitor/test/unit/test_mdn-utils.js devtools/client/netmonitor/test/unit/test_mdn-utils.js
--- devtools/client/netmonitor/test/unit/test_mdn-utils.js
+++ devtools/client/netmonitor/test/unit/test_mdn-utils.js
@@ -1,17 +1,17 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
// Test for mdn-utils
"use strict";
function run_test() {
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const MDN_URL = "https://developer.mozilla.org/docs/";
const GTM_PARAMS_NM = "?utm_source=mozilla" +
"&utm_medium=devtools-netmonitor&utm_campaign=default";
const GTM_PARAMS_WC = "?utm_source=mozilla" +
"&utm_medium=devtools-webconsole&utm_campaign=default";
const {
getHeadersURL,
diff --git devtools/client/performance-new/test/chrome/head.js devtools/client/performance-new/test/chrome/head.js
--- devtools/client/performance-new/test/chrome/head.js
+++ devtools/client/performance-new/test/chrome/head.js
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
/* exported addPerfTest, MockPerfFront */
/* globals URL_ROOT */
-const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
+const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
var { require } = BrowserLoader({
baseURI: "resource://devtools/client/performance-new/",
window,
});
const EventEmitter = require("devtools/shared/event-emitter");
const { perfDescription } = require("devtools/shared/specs/perf");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
diff --git devtools/client/performance/components/test/head.js devtools/client/performance/components/test/head.js
--- devtools/client/performance/components/test/head.js
+++ devtools/client/performance/components/test/head.js
@@ -1,19 +1,19 @@
/* Any copyright is dedicated to the Public Domain.
yield new Promise(function(){});
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
/* global window, document, SimpleTest, requestAnimationFrame, is, ok */
/* exported Cc, Ci, Cu, Cr, Assert, Task, TargetFactory, Toolbox, browserRequire,
forceRender, setProps, dumpn, checkOptimizationHeader, checkOptimizationTree */
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
let { Assert } = require("resource://testing-common/Assert.jsm");
-const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
+const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
const flags = require("devtools/shared/flags");
let { TargetFactory } = require("devtools/client/framework/target");
let { Toolbox } = require("devtools/client/framework/toolbox");
let { require: browserRequire } = BrowserLoader({
baseURI: "resource://devtools/client/performance/",
window,
});
diff --git devtools/client/performance/test/browser_perf-recordings-io-03.js devtools/client/performance/test/browser_perf-recordings-io-03.js
--- devtools/client/performance/test/browser_perf-recordings-io-03.js
+++ devtools/client/performance/test/browser_perf-recordings-io-03.js
@@ -2,18 +2,18 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
/* eslint-disable */
/**
* Tests if the performance tool gracefully handles loading files that are JSON,
* but don't contain the appropriate recording data.
*/
-var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm", {});
-var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm", {});
+var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
var test = async function () {
let { target, panel, toolbox } = await initPerformance(SIMPLE_URL);
let { EVENTS, PerformanceController } = panel.panelWin;
let file = FileUtils.getFile("TmpD", ["tmpprofile.json"]);
file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, parseInt("666", 8));
await asyncCopy({ bogus: "data" }, file);
diff --git devtools/client/performance/test/head.js devtools/client/performance/test/head.js
--- devtools/client/performance/test/head.js
+++ devtools/client/performance/test/head.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
/* import-globals-from ../../shared/test/telemetry-test-helpers.js */
"use strict";
-const { require, loader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require, loader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
try {
Services.scriptloader.loadSubScript(
"chrome://mochitests/content/browser/devtools/client/shared/test/telemetry-test-helpers.js", this);
} catch (e) {
ok(false,
"MISSING DEPENDENCY ON telemetry-test-helpers.js\n" +
"Please add the following line in browser.ini:\n" +
diff --git devtools/client/performance/test/unit/head.js devtools/client/performance/test/unit/head.js
--- devtools/client/performance/test/unit/head.js
+++ devtools/client/performance/test/unit/head.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
/* exported Cc, Ci, Cu, Cr, Services, console, PLATFORM_DATA_PREF, getFrameNodePath,
synthesizeProfileForTest */
-var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
var Services = require("Services");
const RecordingUtils = require("devtools/shared/performance/recording-utils");
const PLATFORM_DATA_PREF = "devtools.performance.ui.show-platform-data";
/**
* Get a path in a FrameNode call tree.
*/
function getFrameNodePath(root, path) {
diff --git devtools/client/responsive.html/index.js devtools/client/responsive.html/index.js
--- devtools/client/responsive.html/index.js
+++ devtools/client/responsive.html/index.js
@@ -2,17 +2,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* eslint-env browser */
"use strict";
const { BrowserLoader } =
- ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
+ ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
const { require } = BrowserLoader({
baseURI: "resource://devtools/client/responsive.html/",
window,
});
const Telemetry = require("devtools/client/shared/telemetry");
const { createFactory, createElement } =
require("devtools/client/shared/vendor/react");
diff --git devtools/client/responsive.html/test/browser/browser_hide_container.js devtools/client/responsive.html/test/browser/browser_hide_container.js
--- devtools/client/responsive.html/test/browser/browser_hide_container.js
+++ devtools/client/responsive.html/test/browser/browser_hide_container.js
@@ -4,17 +4,17 @@
"use strict";
// Ensure that the RDM container tab URL is not recorded in session history.
const TEST_URL = "http://example.com/";
const CONTAINER_URL = "chrome://devtools/content/responsive.html/index.xhtml";
const { TabStateFlusher } =
- ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
+ ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm");
const { OUTER_FRAME_LOADER_SYMBOL } =
require("devtools/client/responsive.html/browser/tunnel");
function flushContainerTabState(tab) {
const browser = tab.linkedBrowser;
const outerBrowser = {
permanentKey: browser.permanentKey,
messageManager: browser[OUTER_FRAME_LOADER_SYMBOL].messageManager,
diff --git devtools/client/responsive.html/test/browser/browser_toolbox_swap_browsers.js devtools/client/responsive.html/test/browser/browser_toolbox_swap_browsers.js
--- devtools/client/responsive.html/test/browser/browser_toolbox_swap_browsers.js
+++ devtools/client/responsive.html/test/browser/browser_toolbox_swap_browsers.js
@@ -5,17 +5,17 @@
// Verify that toolbox remains open when opening and closing RDM.
const TEST_URL = "http://example.com/";
function getServerConnections(browser) {
ok(browser.isRemoteBrowser, "Content browser is remote");
return ContentTask.spawn(browser, {}, async function() {
- const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { DebuggerServer } = require("devtools/server/main");
if (!DebuggerServer._connections) {
return 0;
}
return Object.getOwnPropertyNames(DebuggerServer._connections);
});
}
diff --git devtools/client/responsive.html/test/browser/head.js devtools/client/responsive.html/test/browser/head.js
--- devtools/client/responsive.html/test/browser/head.js
+++ devtools/client/responsive.html/test/browser/head.js
@@ -314,17 +314,17 @@ const selectNetworkThrottling = (ui, val
once(ui, "network-throttling-changed"),
selectMenuItem(ui, "#network-throttling-menu", value),
]);
function getSessionHistory(browser) {
return ContentTask.spawn(browser, {}, async function() {
/* eslint-disable no-undef */
const { SessionHistory } =
- ChromeUtils.import("resource://gre/modules/sessionstore/SessionHistory.jsm", {});
+ ChromeUtils.import("resource://gre/modules/sessionstore/SessionHistory.jsm");
return SessionHistory.collect(docShell);
/* eslint-enable no-undef */
});
}
function getContentSize(ui) {
return spawnViewportTask(ui, {}, () => ({
width: content.screen.width,
diff --git devtools/client/responsive.html/test/unit/head.js devtools/client/responsive.html/test/unit/head.js
--- devtools/client/responsive.html/test/unit/head.js
+++ devtools/client/responsive.html/test/unit/head.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
/* eslint no-unused-vars: [2, {"vars": "local"}] */
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const promise = require("promise");
const Services = require("Services");
const Store = require("devtools/client/responsive.html/store");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
Services.prefs.setBoolPref("devtools.testing", true);
diff --git devtools/client/scratchpad/scratchpad-manager.jsm devtools/client/scratchpad/scratchpad-manager.jsm
--- devtools/client/scratchpad/scratchpad-manager.jsm
+++ devtools/client/scratchpad/scratchpad-manager.jsm
@@ -5,17 +5,17 @@
"use strict";
this.EXPORTED_SYMBOLS = ["ScratchpadManager"];
const SCRATCHPAD_WINDOW_URL = "chrome://devtools/content/scratchpad/index.xul";
const SCRATCHPAD_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const Services = require("Services");
const Telemetry = require("devtools/client/shared/telemetry");
const TELEMETRY_SCRATCHPAD_WIN_OPEN_COUNT = "DEVTOOLS_SCRATCHPAD_WINDOW_OPENED_COUNT";
/**
* The ScratchpadManager object opens new Scratchpad windows and manages the state
* of open scratchpads for session restore. There's only one ScratchpadManager in
diff --git devtools/client/scratchpad/scratchpad.js devtools/client/scratchpad/scratchpad.js
--- devtools/client/scratchpad/scratchpad.js
+++ devtools/client/scratchpad/scratchpad.js
@@ -38,17 +38,17 @@ const SHOW_LINE_NUMBERS = "devtools.scra
const WRAP_TEXT = "devtools.scratchpad.wrapText";
const SHOW_TRAILING_SPACE = "devtools.scratchpad.showTrailingSpace";
const EDITOR_FONT_SIZE = "devtools.scratchpad.editorFontSize";
const ENABLE_AUTOCOMPLETION = "devtools.scratchpad.enableAutocompletion";
const FALLBACK_CHARSET_LIST = "intl.fallbackCharsetList.ISO-8859-1";
const VARIABLES_VIEW_URL = "chrome://devtools/content/shared/widgets/VariablesView.xul";
-const {require, loader} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require, loader} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const Editor = require("devtools/client/sourceeditor/editor");
const TargetFactory = require("devtools/client/framework/target").TargetFactory;
const EventEmitter = require("devtools/shared/event-emitter");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
const Services = require("Services");
const {gDevTools} = require("devtools/client/framework/devtools");
const { extend } = require("devtools/shared/extend");
diff --git devtools/client/scratchpad/test/browser_scratchpad_sessions.js devtools/client/scratchpad/test/browser_scratchpad_sessions.js
--- devtools/client/scratchpad/test/browser_scratchpad_sessions.js
+++ devtools/client/scratchpad/test/browser_scratchpad_sessions.js
@@ -1,13 +1,13 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const {Utils} = ChromeUtils.import("resource://gre/modules/sessionstore/Utils.jsm", {});
+const {Utils} = ChromeUtils.import("resource://gre/modules/sessionstore/Utils.jsm");
const triggeringPrincipal_base64 = Utils.SERIALIZED_SYSTEMPRINCIPAL;
const testState = {
windows: [{
tabs: [
{ entries: [{ url: "about:blank", triggeringPrincipal_base64 }] },
],
}],
diff --git devtools/client/scratchpad/test/browser_scratchpad_wrong_window_focus.js devtools/client/scratchpad/test/browser_scratchpad_wrong_window_focus.js
--- devtools/client/scratchpad/test/browser_scratchpad_wrong_window_focus.js
+++ devtools/client/scratchpad/test/browser_scratchpad_wrong_window_focus.js
@@ -17,17 +17,17 @@ function test() {
// Then we wait for our message to appear in the console and click
// on the location link. After that we check which Scratchpad window
// is currently active (it should be the older one).
gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser).then(function() {
openScratchpad(function() {
const sw = gScratchpadWindow;
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {TargetFactory} = require("devtools/client/framework/target");
openScratchpad(async function() {
const target = await TargetFactory.forTab(gBrowser.selectedTab);
gDevTools.showToolbox(target, "webconsole").then((toolbox) => {
const hud = toolbox.getCurrentPanel().hud;
hud.ui.clearOutput(true);
testFocus(sw, hud);
diff --git devtools/client/scratchpad/test/head.js devtools/client/scratchpad/test/head.js
--- devtools/client/scratchpad/test/head.js
+++ devtools/client/scratchpad/test/head.js
@@ -1,18 +1,18 @@
/* vim: set ts=2 et sw=2 tw=80: */
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm", {});
-const {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm", {});
-const {ScratchpadManager} = ChromeUtils.import("resource://devtools/client/scratchpad/scratchpad-manager.jsm", {});
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+const {ScratchpadManager} = ChromeUtils.import("resource://devtools/client/scratchpad/scratchpad-manager.jsm");
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {gDevTools} = require("devtools/client/framework/devtools");
const Services = require("Services");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
var gScratchpadWindow; // Reference to the Scratchpad chrome window object
/**
* Open a Scratchpad window.
diff --git devtools/client/shared/DOMHelpers.jsm devtools/client/shared/DOMHelpers.jsm
--- devtools/client/shared/DOMHelpers.jsm
+++ devtools/client/shared/DOMHelpers.jsm
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const nodeFilterConstants = require("devtools/shared/dom-node-filter-constants");
this.EXPORTED_SYMBOLS = ["DOMHelpers"];
/**
* DOMHelpers
* Makes DOM traversal easier. Goes through iframes.
*
diff --git devtools/client/shared/SplitView.jsm devtools/client/shared/SplitView.jsm
--- devtools/client/shared/SplitView.jsm
+++ devtools/client/shared/SplitView.jsm
@@ -1,16 +1,16 @@
/* vim:set ts=2 sw=2 sts=2 et: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {KeyCodes} = require("devtools/client/shared/keycodes");
this.EXPORTED_SYMBOLS = ["SplitView"];
/* this must be kept in sync with CSS (ie. splitview.css) */
const LANDSCAPE_MEDIA_QUERY = "(min-width: 701px)";
var bindings = new WeakMap();
diff --git devtools/client/shared/browser-loader.js devtools/client/shared/browser-loader.js
--- devtools/client/shared/browser-loader.js
+++ devtools/client/shared/browser-loader.js
@@ -1,18 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const loaders = ChromeUtils.import("resource://devtools/shared/base-loader.js", {});
+const loaders = ChromeUtils.import("resource://devtools/shared/base-loader.js", null);
const {
devtools,
loader,
-} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const flags = devtools.require("devtools/shared/flags");
const { joinURI } = devtools.require("devtools/shared/path");
const { assert } = devtools.require("devtools/shared/DevToolsUtils");
const { AppConstants } = devtools.require("resource://gre/modules/AppConstants.jsm");
loader.lazyRequireGetter(this, "getMockedModule",
"devtools/client/shared/browser-loader-mocks", {});
diff --git devtools/client/shared/components/test/mochitest/head.js devtools/client/shared/components/test/mochitest/head.js
--- devtools/client/shared/components/test/mochitest/head.js
+++ devtools/client/shared/components/test/mochitest/head.js
@@ -1,19 +1,19 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* eslint no-unused-vars: [2, {"vars": "local"}] */
"use strict";
-var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
var { Assert } = require("resource://testing-common/Assert.jsm");
var { gDevTools } = require("devtools/client/framework/devtools");
-var { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
+var { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
var promise = require("promise");
var defer = require("devtools/shared/defer");
var Services = require("Services");
var { DebuggerServer } = require("devtools/server/main");
var { DebuggerClient } = require("devtools/shared/client/debugger-client");
var DevToolsUtils = require("devtools/shared/DevToolsUtils");
var { TargetFactory } = require("devtools/client/framework/target");
var { Toolbox } = require("devtools/client/framework/toolbox");
diff --git devtools/client/shared/redux/middleware/test/head.js devtools/client/shared/redux/middleware/test/head.js
--- devtools/client/shared/redux/middleware/test/head.js
+++ devtools/client/shared/redux/middleware/test/head.js
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* exported waitUntilState */
"use strict";
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
function waitUntilState(store, predicate) {
return new Promise(resolve => {
const unsubscribe = store.subscribe(check);
function check() {
if (predicate(store.getState())) {
unsubscribe();
resolve();
diff --git devtools/client/shared/test/browser_browserloader_mocks.js devtools/client/shared/test/browser_browserloader_mocks.js
--- devtools/client/shared/test/browser_browserloader_mocks.js
+++ devtools/client/shared/test/browser_browserloader_mocks.js
@@ -1,17 +1,17 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const { BrowserLoader } =
- ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
+ ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
const { getMockedModule, setMockedModule, removeMockedModule } =
require("devtools/client/shared/browser-loader-mocks");
const { require: browserRequire } = BrowserLoader({
baseURI: "resource://devtools/client/shared/",
window,
});
diff --git devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.js devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.js
--- devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.js
+++ devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.js
@@ -43,17 +43,17 @@ add_task(async function() {
});
});
sendAsyncMessage("devtools-test:command", cmd);
return onDone;
}
const doc = content.document;
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {getAdjustedQuads} = require("devtools/shared/layout/utils");
ok(typeof getAdjustedQuads === "function", "getAdjustedQuads is defined");
returnsTheRightDataStructure();
isEmptyForMissingNode();
isEmptyForHiddenNodes();
defaultsToBorderBoxIfNoneProvided();
diff --git devtools/client/shared/test/browser_require_raw.js devtools/client/shared/test/browser_require_raw.js
--- devtools/client/shared/test/browser_require_raw.js
+++ devtools/client/shared/test/browser_require_raw.js
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
+const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
const { require: browserRequire } = BrowserLoader({
baseURI: "resource://devtools/client/shared/",
window,
});
const variableFileContents = browserRequire("raw!devtools/client/themes/variables.css");
diff --git devtools/client/shared/test/frame-script-utils.js devtools/client/shared/test/frame-script-utils.js
--- devtools/client/shared/test/frame-script-utils.js
+++ devtools/client/shared/test/frame-script-utils.js
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* eslint-env browser */
/* global addMessageListener, sendAsyncMessage, content */
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const Services = require("Services");
addMessageListener("devtools:test:history", function({ data }) {
content.history[data.direction]();
});
addMessageListener("devtools:test:navigate", function({ data }) {
content.location = data.location;
diff --git devtools/client/shared/test/head.js devtools/client/shared/test/head.js
--- devtools/client/shared/test/head.js
+++ devtools/client/shared/test/head.js
@@ -5,17 +5,17 @@
/* import-globals-from shared-head.js */
/* import-globals-from telemetry-test-helpers.js */
"use strict";
// shared-head.js handles imports, constants, and utility functions
Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js", this);
-const {DOMHelpers} = ChromeUtils.import("resource://devtools/client/shared/DOMHelpers.jsm", {});
+const {DOMHelpers} = ChromeUtils.import("resource://devtools/client/shared/DOMHelpers.jsm");
const {Hosts} = require("devtools/client/framework/toolbox-hosts");
const TEST_URI_ROOT = "http://example.com/browser/devtools/client/shared/test/";
const OPTIONS_VIEW_URL = TEST_URI_ROOT + "doc_options-view.xul";
const EXAMPLE_URL = "chrome://mochitests/content/browser/devtools/client/shared/test/";
function catchFail(func) {
diff --git devtools/client/shared/test/helper_addons.js devtools/client/shared/test/helper_addons.js
--- devtools/client/shared/test/helper_addons.js
+++ devtools/client/shared/test/helper_addons.js
@@ -6,17 +6,17 @@
const chromeRegistry =
Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIChromeRegistry);
const DEBUGGER_CHROME_URL = "chrome://mochitests/content/browser/devtools/client/shared/test/";
const DEBUGGER_CHROME_URI = Services.io.newURI(DEBUGGER_CHROME_URL);
const EventEmitter = require("devtools/shared/event-emitter");
-var { AddonManager } = ChromeUtils.import("resource://gre/modules/AddonManager.jsm", {});
+var { AddonManager } = ChromeUtils.import("resource://gre/modules/AddonManager.jsm");
/**
* Returns a thenable promise
* @return {Promise}
*/
function getDeferredPromise() {
// Override promise with deprecated-sync-thenables
const promise = require("devtools/shared/deprecated-sync-thenables");
diff --git devtools/client/shared/test/shared-head.js devtools/client/shared/test/shared-head.js
--- devtools/client/shared/test/shared-head.js
+++ devtools/client/shared/test/shared-head.js
@@ -660,17 +660,17 @@ function waitForTitleChange(toolbox) {
* The server can be accessed like:
*
* const server = createTestHTTPServer();
* let url = "http://localhost: " + server.identity.primaryPort + "/path";
*
* @returns {HttpServer}
*/
function createTestHTTPServer() {
- const {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js", {});
+ const {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js");
const server = new HttpServer();
registerCleanupFunction(async function cleanup() {
await new Promise(resolve => server.stop(resolve));
});
server.start(-1);
return server;
@@ -738,13 +738,13 @@ async function registerActorInContentPro
.getService(Ci.nsIChromeRegistry)
.convertChromeURL(Services.io.newURI(uri)).spec;
}
// chrome://mochitests URI is registered only in the parent process, so convert these
// URLs to file:// one in order to work in the content processes
url = url.startsWith("chrome://mochitests") ? convertChromeToFile(url) : url;
return ContentTask.spawn(gBrowser.selectedBrowser, { url, options }, args => {
// eslint-disable-next-line no-shadow
- const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
ActorRegistry.registerModule(args.url, args.options);
});
}
diff --git devtools/client/shared/test/test-actor-registry.js devtools/client/shared/test/test-actor-registry.js
--- devtools/client/shared/test/test-actor-registry.js
+++ devtools/client/shared/test/test-actor-registry.js
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
(function(exports) {
const CC = Components.Constructor;
- const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { fetch } = require("devtools/shared/DevToolsUtils");
const TEST_URL_ROOT = "http://example.com/browser/devtools/client/shared/test/";
const ACTOR_URL = TEST_URL_ROOT + "test-actor.js";
// Register a test actor that can operate on the remote document
exports.registerTestActor = async function(client) {
// First, instanciate ActorRegistryFront to be able to dynamically register an actor
diff --git devtools/client/shared/test/unit/test_VariablesView_filtering-without-controller.js devtools/client/shared/test/unit/test_VariablesView_filtering-without-controller.js
--- devtools/client/shared/test/unit/test_VariablesView_filtering-without-controller.js
+++ devtools/client/shared/test/unit/test_VariablesView_filtering-without-controller.js
@@ -3,19 +3,19 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Test that VariablesView._doSearch() works even without an attached
// VariablesViewController (bug 1196341).
const { VariablesView } =
- ChromeUtils.import("resource://devtools/client/shared/widgets/VariablesView.jsm", {});
+ ChromeUtils.import("resource://devtools/client/shared/widgets/VariablesView.jsm");
const { require } =
- ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { globals } = require("devtools/shared/builtin-modules");
const DOMParser = new globals.DOMParser();
DOMParser.forceEnableXULXBL();
function run_test() {
const doc = DOMParser.parseFromString("<div>", "text/html");
const container = doc.body.firstChild;
diff --git devtools/client/shared/test/unit/test_VariablesView_getString_promise.js devtools/client/shared/test/unit/test_VariablesView_getString_promise.js
--- devtools/client/shared/test/unit/test_VariablesView_getString_promise.js
+++ devtools/client/shared/test/unit/test_VariablesView_getString_promise.js
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { VariablesView } = ChromeUtils.import("resource://devtools/client/shared/widgets/VariablesView.jsm", {});
+const { VariablesView } = ChromeUtils.import("resource://devtools/client/shared/widgets/VariablesView.jsm");
const PENDING = {
"type": "object",
"class": "Promise",
"actor": "conn0.pausedobj35",
"extensible": true,
"frozen": false,
"sealed": false,
diff --git devtools/client/shared/test/unit/test_WeakMapMap.js devtools/client/shared/test/unit/test_WeakMapMap.js
--- devtools/client/shared/test/unit/test_WeakMapMap.js
+++ devtools/client/shared/test/unit/test_WeakMapMap.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
// Test WeakMapMap.
"use strict";
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const WeakMapMap = require("devtools/client/shared/WeakMapMap");
const myWeakMapMap = new WeakMapMap();
const key = { randomObject: true };
// eslint-disable-next-line
function run_test() {
test_set();
diff --git devtools/client/shared/test/unit/test_advanceValidate.js devtools/client/shared/test/unit/test_advanceValidate.js
--- devtools/client/shared/test/unit/test_advanceValidate.js
+++ devtools/client/shared/test/unit/test_advanceValidate.js
@@ -2,17 +2,17 @@
/* vim: set ts=2 et sw=2 tw=80: */
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Tests the advanceValidate function from rule-view.js.
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {advanceValidate} = require("devtools/client/inspector/shared/utils");
const {KeyCodes} = require("devtools/client/shared/keycodes");
// 1 2 3
// 0123456789012345678901234567890
const sampleInput = '\\symbol "string" url(somewhere)';
function testInsertion(where, result, testName) {
diff --git devtools/client/shared/test/unit/test_attribute-parsing-01.js devtools/client/shared/test/unit/test_attribute-parsing-01.js
--- devtools/client/shared/test/unit/test_attribute-parsing-01.js
+++ devtools/client/shared/test/unit/test_attribute-parsing-01.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Test splitBy from node-attribute-parser.js
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {splitBy} = require("devtools/client/shared/node-attribute-parser");
const TEST_DATA = [{
value: "this is a test",
splitChar: " ",
expected: [
{value: "this"},
{value: " ", type: "string"},
diff --git devtools/client/shared/test/unit/test_attribute-parsing-02.js devtools/client/shared/test/unit/test_attribute-parsing-02.js
--- devtools/client/shared/test/unit/test_attribute-parsing-02.js
+++ devtools/client/shared/test/unit/test_attribute-parsing-02.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Test parseAttribute from node-attribute-parser.js
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {parseAttribute} = require("devtools/client/shared/node-attribute-parser");
const TEST_DATA = [{
tagName: "body",
namespaceURI: "http://www.w3.org/1999/xhtml",
attributeName: "class",
attributeValue: "some css class names",
expected: [
diff --git devtools/client/shared/test/unit/test_bezierCanvas.js devtools/client/shared/test/unit/test_bezierCanvas.js
--- devtools/client/shared/test/unit/test_bezierCanvas.js
+++ devtools/client/shared/test/unit/test_bezierCanvas.js
@@ -2,17 +2,17 @@
/* vim: set ts=2 et sw=2 tw=80: */
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Tests the BezierCanvas API in the CubicBezierWidget module
-var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
var {CubicBezier, BezierCanvas} = require("devtools/client/shared/widgets/CubicBezierWidget");
function run_test() {
offsetsGetterReturnsData();
convertsOffsetsToCoordinates();
plotsCanvas();
}
diff --git devtools/client/shared/test/unit/test_cssAngle.js devtools/client/shared/test/unit/test_cssAngle.js
--- devtools/client/shared/test/unit/test_cssAngle.js
+++ devtools/client/shared/test/unit/test_cssAngle.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
// Test classifyAngle.
"use strict";
-var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {angleUtils} = require("devtools/client/shared/css-angle");
const CLASSIFY_TESTS = [
{ input: "180deg", output: "deg" },
{ input: "-180deg", output: "deg" },
{ input: "180DEG", output: "deg" },
{ input: "200rad", output: "rad" },
diff --git devtools/client/shared/test/unit/test_cssColor-01.js devtools/client/shared/test/unit/test_cssColor-01.js
--- devtools/client/shared/test/unit/test_cssColor-01.js
+++ devtools/client/shared/test/unit/test_cssColor-01.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
// Test classifyColor.
"use strict";
-var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {colorUtils} = require("devtools/shared/css/color");
const InspectorUtils = require("InspectorUtils");
const CLASSIFY_TESTS = [
{ input: "rgb(255,0,192)", output: "rgb" },
{ input: "RGB(255,0,192)", output: "rgb" },
{ input: "RGB(100%,0%,83%)", output: "rgb" },
{ input: "rgba(255,0,192, 0.25)", output: "rgb" },
diff --git devtools/client/shared/test/unit/test_cssColor-02.js devtools/client/shared/test/unit/test_cssColor-02.js
--- devtools/client/shared/test/unit/test_cssColor-02.js
+++ devtools/client/shared/test/unit/test_cssColor-02.js
@@ -4,17 +4,17 @@
/**
* Test color cycling regression - Bug 1303748.
*
* Values should cycle from a starting value, back to their original values. This can
* potentially be a little flaky due to the precision of different color representations.
*/
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {colorUtils} = require("devtools/shared/css/color");
const getFixtureColorData = require("resource://test/helper_color_data.js");
function run_test() {
getFixtureColorData().forEach(({authored, name, hex, hsl, rgb, cycle}) => {
if (cycle) {
const nameCycled = runCycle(name, cycle);
const hexCycled = runCycle(hex, cycle);
diff --git devtools/client/shared/test/unit/test_cssColor-03.js devtools/client/shared/test/unit/test_cssColor-03.js
--- devtools/client/shared/test/unit/test_cssColor-03.js
+++ devtools/client/shared/test/unit/test_cssColor-03.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
// Test css-color-4 color function syntax and old-style syntax.
"use strict";
-var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {colorUtils} = require("devtools/shared/css/color");
const InspectorUtils = require("InspectorUtils");
const OLD_STYLE_TESTS = [
"rgb(255,0,192)",
"RGB(255,0,192)",
"RGB(100%,0%,83%)",
"rgba(255,0,192,0.25)",
diff --git devtools/client/shared/test/unit/test_cssColorDatabase.js devtools/client/shared/test/unit/test_cssColorDatabase.js
--- devtools/client/shared/test/unit/test_cssColorDatabase.js
+++ devtools/client/shared/test/unit/test_cssColorDatabase.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
// Test that css-color-db matches platform.
"use strict";
-var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {colorUtils} = require("devtools/shared/css/color");
const {cssColors} = require("devtools/shared/css/color-db");
const InspectorUtils = require("InspectorUtils");
function isValid(colorName) {
ok(colorUtils.isValidCSSColor(colorName),
colorName + " is valid in database");
diff --git devtools/client/shared/test/unit/test_cubicBezier.js devtools/client/shared/test/unit/test_cubicBezier.js
--- devtools/client/shared/test/unit/test_cubicBezier.js
+++ devtools/client/shared/test/unit/test_cubicBezier.js
@@ -2,17 +2,17 @@
/* vim: set ts=2 et sw=2 tw=80: */
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Tests the CubicBezier API in the CubicBezierWidget module
-var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
var {CubicBezier, parseTimingFunction} = require("devtools/client/shared/widgets/CubicBezierWidget");
function run_test() {
throwsWhenMissingCoordinates();
throwsWhenIncorrectCoordinates();
convertsStringCoordinates();
coordinatesToStringOutputsAString();
pointGettersReturnPointCoordinatesArrays();
diff --git devtools/client/shared/test/unit/test_escapeCSSComment.js devtools/client/shared/test/unit/test_escapeCSSComment.js
--- devtools/client/shared/test/unit/test_escapeCSSComment.js
+++ devtools/client/shared/test/unit/test_escapeCSSComment.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {escapeCSSComment, _unescapeCSSComment} = require("devtools/shared/css/parsing-utils");
const TEST_DATA = [
{
input: "simple",
expected: "simple",
},
{
diff --git devtools/client/shared/test/unit/test_parseDeclarations.js devtools/client/shared/test/unit/test_parseDeclarations.js
--- devtools/client/shared/test/unit/test_parseDeclarations.js
+++ devtools/client/shared/test/unit/test_parseDeclarations.js
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {
parseDeclarations,
_parseCommentDeclarations,
parseNamedDeclarations,
} = require("devtools/shared/css/parsing-utils");
const {isCssPropertyKnown} = require("devtools/server/actors/css-properties");
const TEST_DATA = [
diff --git devtools/client/shared/test/unit/test_parsePseudoClassesAndAttributes.js devtools/client/shared/test/unit/test_parsePseudoClassesAndAttributes.js
--- devtools/client/shared/test/unit/test_parsePseudoClassesAndAttributes.js
+++ devtools/client/shared/test/unit/test_parsePseudoClassesAndAttributes.js
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {
parsePseudoClassesAndAttributes,
SELECTOR_ATTRIBUTE,
SELECTOR_ELEMENT,
SELECTOR_PSEUDO_CLASS,
} = require("devtools/shared/css/parsing-utils");
const TEST_DATA = [
diff --git devtools/client/shared/test/unit/test_parseSingleValue.js devtools/client/shared/test/unit/test_parseSingleValue.js
--- devtools/client/shared/test/unit/test_parseSingleValue.js
+++ devtools/client/shared/test/unit/test_parseSingleValue.js
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {parseSingleValue} = require("devtools/shared/css/parsing-utils");
const {isCssPropertyKnown} = require("devtools/server/actors/css-properties");
const TEST_DATA = [
{input: null, throws: true},
{input: undefined, throws: true},
{input: "", expected: {value: "", priority: ""}},
{input: " \t \t \n\n ", expected: {value: "", priority: ""}},
diff --git devtools/client/shared/test/unit/test_rewriteDeclarations.js devtools/client/shared/test/unit/test_rewriteDeclarations.js
--- devtools/client/shared/test/unit/test_rewriteDeclarations.js
+++ devtools/client/shared/test/unit/test_rewriteDeclarations.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {RuleRewriter} = require("devtools/shared/css/parsing-utils");
const {isCssPropertyKnown} = require("devtools/server/actors/css-properties");
const TEST_DATA = [
{
desc: "simple set",
input: "p:v;",
instruction: {type: "set", name: "p", value: "N", priority: "",
diff --git devtools/client/shared/test/unit/test_source-utils.js devtools/client/shared/test/unit/test_source-utils.js
--- devtools/client/shared/test/unit/test_source-utils.js
+++ devtools/client/shared/test/unit/test_source-utils.js
@@ -2,17 +2,17 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
/**
* Tests utility functions contained in `source-utils.js`
*/
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const sourceUtils = require("devtools/client/shared/source-utils");
const CHROME_URLS = [
"chrome://foo", "resource://baz", "jar:file:///Users/root",
];
const CONTENT_URLS = [
"http://mozilla.org", "https://mozilla.org", "file:///Users/root", "app://fxosapp",
diff --git devtools/client/shared/test/unit/test_suggestion-picker.js devtools/client/shared/test/unit/test_suggestion-picker.js
--- devtools/client/shared/test/unit/test_suggestion-picker.js
+++ devtools/client/shared/test/unit/test_suggestion-picker.js
@@ -1,17 +1,17 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
/**
* Test the suggestion-picker helper methods.
*/
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {
findMostRelevantIndex,
findMostRelevantCssPropertyIndex,
} = require("devtools/client/shared/suggestion-picker");
/**
* Run all tests defined below.
*/
diff --git devtools/client/shared/test/unit/test_undoStack.js devtools/client/shared/test/unit/test_undoStack.js
--- devtools/client/shared/test/unit/test_undoStack.js
+++ devtools/client/shared/test/unit/test_undoStack.js
@@ -1,17 +1,17 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const {Loader, Require} =
- ChromeUtils.import("resource://devtools/shared/base-loader.js", {});
+ ChromeUtils.import("resource://devtools/shared/base-loader.js");
const loader = new Loader({
paths: {
"devtools": "resource://devtools",
},
globals: {},
});
const require = Require(loader, { id: "undo-test" });
diff --git devtools/client/shared/test/unit/test_unicode-url.js devtools/client/shared/test/unit/test_unicode-url.js
--- devtools/client/shared/test/unit/test_unicode-url.js
+++ devtools/client/shared/test/unit/test_unicode-url.js
@@ -2,17 +2,17 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
/**
* Tests utility functions contained in `unicode-url.js`
*/
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { getUnicodeUrl, getUnicodeUrlPath, getUnicodeHostname } =
require("devtools/client/shared/unicode-url");
// List of URLs used to test Unicode URL conversion
const TEST_URLS = [
// Type: Readable ASCII URLs
// Expected: All of Unicode versions should equal to the raw.
{
diff --git devtools/client/shared/theme-switching.js devtools/client/shared/theme-switching.js
--- devtools/client/shared/theme-switching.js
+++ devtools/client/shared/theme-switching.js
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* eslint-env browser */
"use strict";
(function() {
- const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const Services = require("Services");
const { gDevTools } = require("devtools/client/framework/devtools");
const { appendStyleSheet } = require("devtools/client/shared/stylesheet-utils");
const documentElement = document.documentElement;
let os;
const platform = navigator.platform;
diff --git devtools/client/shared/webpack/shims/test/test_stack.js devtools/client/shared/webpack/shims/test/test_stack.js
--- devtools/client/shared/webpack/shims/test/test_stack.js
+++ devtools/client/shared/webpack/shims/test/test_stack.js
@@ -1,17 +1,17 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
// There isn't really very much about the content stack.js that we can
// test, but we'll do what we can.
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {
callFunctionWithAsyncStack,
getStack,
getNthPathExcluding,
} = require("devtools/client/shared/webpack/shims/platform-stack-stub");
function f3() {
diff --git devtools/client/shared/widgets/AbstractTreeItem.jsm devtools/client/shared/widgets/AbstractTreeItem.jsm
--- devtools/client/shared/widgets/AbstractTreeItem.jsm
+++ devtools/client/shared/widgets/AbstractTreeItem.jsm
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { require, loader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require, loader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { ViewHelpers } = require("devtools/client/shared/widgets/view-helpers");
const { KeyCodes } = require("devtools/client/shared/keycodes");
loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter");
this.EXPORTED_SYMBOLS = ["AbstractTreeItem"];
/**
diff --git devtools/client/shared/widgets/BreadcrumbsWidget.jsm devtools/client/shared/widgets/BreadcrumbsWidget.jsm
--- devtools/client/shared/widgets/BreadcrumbsWidget.jsm
+++ devtools/client/shared/widgets/BreadcrumbsWidget.jsm
@@ -2,17 +2,17 @@
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const ENSURE_SELECTION_VISIBLE_DELAY = 50; // ms
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { ViewHelpers, setNamedTimeout } = require("devtools/client/shared/widgets/view-helpers");
const EventEmitter = require("devtools/shared/event-emitter");
this.EXPORTED_SYMBOLS = ["BreadcrumbsWidget"];
/**
* A breadcrumb-like list of items.
*
diff --git devtools/client/shared/widgets/SideMenuWidget.jsm devtools/client/shared/widgets/SideMenuWidget.jsm
--- devtools/client/shared/widgets/SideMenuWidget.jsm
+++ devtools/client/shared/widgets/SideMenuWidget.jsm
@@ -2,17 +2,17 @@
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const SHARED_STRINGS_URI = "devtools/client/locales/shared.properties";
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const EventEmitter = require("devtools/shared/event-emitter");
const { LocalizationHelper } = require("devtools/shared/l10n");
const { ViewHelpers } = require("devtools/client/shared/widgets/view-helpers");
this.EXPORTED_SYMBOLS = ["SideMenuWidget"];
/**
* Localization convenience methods.
diff --git devtools/client/shared/widgets/SimpleListWidget.jsm devtools/client/shared/widgets/SimpleListWidget.jsm
--- devtools/client/shared/widgets/SimpleListWidget.jsm
+++ devtools/client/shared/widgets/SimpleListWidget.jsm
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { ViewHelpers } = require("devtools/client/shared/widgets/view-helpers");
this.EXPORTED_SYMBOLS = ["SimpleListWidget"];
/**
* A very simple vertical list view.
*
* Note: this widget should be used in tandem with the WidgetMethods in
diff --git devtools/client/shared/widgets/VariablesView.jsm devtools/client/shared/widgets/VariablesView.jsm
--- devtools/client/shared/widgets/VariablesView.jsm
+++ devtools/client/shared/widgets/VariablesView.jsm
@@ -8,17 +8,17 @@
const DBG_STRINGS_URI = "devtools/client/locales/debugger.properties";
const LAZY_EMPTY_DELAY = 150; // ms
const SCROLL_PAGE_SIZE_DEFAULT = 0;
const PAGE_SIZE_SCROLL_HEIGHT_RATIO = 100;
const PAGE_SIZE_MAX_JUMPS = 30;
const SEARCH_ACTION_MAX_DELAY = 300; // ms
const ITEM_FLASH_DURATION = 300; // ms
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {XPCOMUtils} = require("resource://gre/modules/XPCOMUtils.jsm");
const EventEmitter = require("devtools/shared/event-emitter");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
const Services = require("Services");
const { getSourceNames } = require("devtools/client/shared/source-utils");
const promise = require("promise");
const defer = require("devtools/shared/defer");
const { extend } = require("devtools/shared/extend");
diff --git devtools/client/shared/widgets/VariablesViewController.jsm devtools/client/shared/widgets/VariablesViewController.jsm
--- devtools/client/shared/widgets/VariablesViewController.jsm
+++ devtools/client/shared/widgets/VariablesViewController.jsm
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
var {XPCOMUtils} = require("resource://gre/modules/XPCOMUtils.jsm");
var {VariablesView} = require("resource://devtools/client/shared/widgets/VariablesView.jsm");
var Services = require("Services");
var promise = require("promise");
var defer = require("devtools/shared/defer");
var {LocalizationHelper, ELLIPSIS} = require("devtools/shared/l10n");
Object.defineProperty(this, "WebConsoleUtils", {
diff --git devtools/client/sourceeditor/tern/tests/unit/head_tern.js devtools/client/sourceeditor/tern/tests/unit/head_tern.js
--- devtools/client/sourceeditor/tern/tests/unit/head_tern.js
+++ devtools/client/sourceeditor/tern/tests/unit/head_tern.js
@@ -1,2 +1,2 @@
"use strict";
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
diff --git devtools/client/styleeditor/StyleEditorUI.jsm devtools/client/styleeditor/StyleEditorUI.jsm
--- devtools/client/styleeditor/StyleEditorUI.jsm
+++ devtools/client/styleeditor/StyleEditorUI.jsm
@@ -2,17 +2,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
this.EXPORTED_SYMBOLS = ["StyleEditorUI"];
-const {loader, require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {loader, require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const Services = require("Services");
const {NetUtil} = require("resource://gre/modules/NetUtil.jsm");
const {OS} = require("resource://gre/modules/osfile.jsm");
const EventEmitter = require("devtools/shared/event-emitter");
const {gDevTools} = require("devtools/client/framework/devtools");
const {
getString,
text,
diff --git devtools/client/styleeditor/StyleEditorUtil.jsm devtools/client/styleeditor/StyleEditorUtil.jsm
--- devtools/client/styleeditor/StyleEditorUtil.jsm
+++ devtools/client/styleeditor/StyleEditorUtil.jsm
@@ -14,17 +14,17 @@ this.EXPORTED_SYMBOLS = [
"log",
"text",
"wire",
"showFilePicker",
];
const PROPERTIES_URL = "chrome://devtools/locale/styleeditor.properties";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const Services = require("Services");
const gStringBundle = Services.strings.createBundle(PROPERTIES_URL);
/**
* Returns a localized string with the given key name from the string bundle.
*
* @param name
* @param ...rest
diff --git devtools/client/styleeditor/StyleSheetEditor.jsm devtools/client/styleeditor/StyleSheetEditor.jsm
--- devtools/client/styleeditor/StyleSheetEditor.jsm
+++ devtools/client/styleeditor/StyleSheetEditor.jsm
@@ -2,26 +2,26 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
this.EXPORTED_SYMBOLS = ["StyleSheetEditor"];
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const Editor = require("devtools/client/sourceeditor/editor");
const promise = require("promise");
const {shortSource, prettifyCSS} = require("devtools/shared/inspector/css-logic");
const {throttle} = require("devtools/shared/throttle");
const Services = require("Services");
const EventEmitter = require("devtools/shared/event-emitter");
const {FileUtils} = require("resource://gre/modules/FileUtils.jsm");
const {NetUtil} = require("resource://gre/modules/NetUtil.jsm");
-const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm", {});
+const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
const {
getString,
showFilePicker,
} = require("resource://devtools/client/styleeditor/StyleEditorUtil.jsm");
const LOAD_ERROR = "error-load";
const SAVE_ERROR = "error-save";
diff --git devtools/client/styleeditor/test/browser_styleeditor_sourcemap_watching.js devtools/client/styleeditor/test/browser_styleeditor_sourcemap_watching.js
--- devtools/client/styleeditor/test/browser_styleeditor_sourcemap_watching.js
+++ devtools/client/styleeditor/test/browser_styleeditor_sourcemap_watching.js
@@ -11,18 +11,18 @@ const TESTCASE_URI_REG_CSS = TEST_BASE_H
const TESTCASE_URI_SCSS = TEST_BASE_HTTP + "sourcemap-sass/sourcemaps.scss";
const TESTCASE_URI_MAP = TEST_BASE_HTTP + "sourcemap-css/sourcemaps.css.map";
const TESTCASE_SCSS_NAME = "sourcemaps.scss";
const TRANSITIONS_PREF = "devtools.styleeditor.transitions";
const CSS_TEXT = "* { color: blue }";
-const {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm", {});
-const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm", {});
+const {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
add_task(async function() {
await new Promise(resolve => {
SpecialPowers.pushPrefEnv({"set": [
[TRANSITIONS_PREF, false],
]}, resolve);
});
diff --git devtools/client/webaudioeditor/includes.js devtools/client/webaudioeditor/includes.js
--- devtools/client/webaudioeditor/includes.js
+++ devtools/client/webaudioeditor/includes.js
@@ -1,14 +1,14 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { loader, require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { loader, require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
const EventEmitter = require("devtools/shared/event-emitter");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
const Services = require("Services");
const { gDevTools } = require("devtools/client/framework/devtools");
const { LocalizationHelper } = require("devtools/shared/l10n");
const { ViewHelpers } = require("devtools/client/shared/widgets/view-helpers");
diff --git devtools/client/webconsole/main.js devtools/client/webconsole/main.js
--- devtools/client/webconsole/main.js
+++ devtools/client/webconsole/main.js
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global BrowserLoader */
"use strict";
-const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
+const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
this.WebConsoleOutput = function(parentNode, jsterm, toolbox, owner, serviceContainer) {
// Initialize module loader and load all modules of the new inline
// preview feature. The entire code-base doesn't need any extra
// privileges and runs entirely in content scope.
const WebConsoleOutputWrapper = BrowserLoader({
baseURI: "resource://devtools/client/webconsole/",
window,
diff --git devtools/client/webconsole/test/chrome/head.js devtools/client/webconsole/test/chrome/head.js
--- devtools/client/webconsole/test/chrome/head.js
+++ devtools/client/webconsole/test/chrome/head.js
@@ -1,12 +1,12 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
/* exported Task, browserRequire */
"use strict";
-var { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
+var { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js");
var { require: browserRequire } = BrowserLoader({
baseURI: "resource://devtools/client/webconsole/",
window,
});
diff --git devtools/client/webconsole/test/chrome/test_render_perf.html devtools/client/webconsole/test/chrome/test_render_perf.html
--- devtools/client/webconsole/test/chrome/test_render_perf.html
+++ devtools/client/webconsole/test/chrome/test_render_perf.html
@@ -16,17 +16,17 @@
"use strict";
// To analyze the profile results:
// > ./mach mochitest test_render_perf.html
// Then open https://perf-html.io and drag the json file printed at the end of this test
const NUM_MESSAGES = 4000;
const NUM_STREAMING = 100;
-ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+const {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
const Services = browserRequire("Services");
Services.prefs.setIntPref("devtools.hud.loglimit", NUM_MESSAGES);
const WebConsoleOutputWrapper = browserRequire(
"devtools/client/webconsole/webconsole-output-wrapper");
const actions =
browserRequire("devtools/client/webconsole/actions/index");
const EventEmitter = browserRequire("devtools/shared/event-emitter");
const testPackets = Array.from({length: NUM_MESSAGES}).map((el, id) => ({
diff --git devtools/client/webconsole/test/mochitest/browser_console_consolejsm_output.js devtools/client/webconsole/test/mochitest/browser_console_consolejsm_output.js
--- devtools/client/webconsole/test/mochitest/browser_console_consolejsm_output.js
+++ devtools/client/webconsole/test/mochitest/browser_console_consolejsm_output.js
@@ -7,17 +7,17 @@
"use strict";
add_task(async function testCategoryLogs() {
const consoleStorage = Cc["@mozilla.org/consoleAPI-storage;1"];
const storage = consoleStorage.getService(Ci.nsIConsoleAPIStorage);
storage.clearEvents();
- const {console} = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
+ const {console} = ChromeUtils.import("resource://gre/modules/Console.jsm");
console.log("bug861338-log-cached");
const hud = await HUDService.toggleBrowserConsole();
await checkMessageExists(hud, "bug861338-log-cached");
hud.ui.clearOutput(true);
@@ -52,17 +52,17 @@ add_task(async function testCategoryLogs
await HUDService.toggleBrowserConsole();
});
add_task(async function testFilter() {
const consoleStorage = Cc["@mozilla.org/consoleAPI-storage;1"];
const storage = consoleStorage.getService(Ci.nsIConsoleAPIStorage);
storage.clearEvents();
- const {ConsoleAPI} = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
+ const {ConsoleAPI} = ChromeUtils.import("resource://gre/modules/Console.jsm");
const console2 = new ConsoleAPI();
const hud = await HUDService.toggleBrowserConsole();
// Enable the error category and disable the log category.
await setFilterState(hud, {
error: true,
log: false,
});
@@ -82,17 +82,17 @@ add_task(async function testFilter() {
hud.ui.clearOutput(true);
await HUDService.toggleBrowserConsole();
});
// Test that console.profile / profileEnd trigger the right events
add_task(async function testProfile() {
const consoleStorage = Cc["@mozilla.org/consoleAPI-storage;1"];
const storage = consoleStorage.getService(Ci.nsIConsoleAPIStorage);
- const { console } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
+ const { console } = ChromeUtils.import("resource://gre/modules/Console.jsm");
storage.clearEvents();
const profilerEvents = [];
function observer(subject, topic) {
is(topic, "console-api-profiler", "The topic is 'console-api-profiler'");
const subjectObj = subject.wrappedJSObject;
diff --git devtools/client/webconsole/test/mochitest/browser_webconsole_trackingprotection_errors.js devtools/client/webconsole/test/mochitest/browser_webconsole_trackingprotection_errors.js
--- devtools/client/webconsole/test/mochitest/browser_webconsole_trackingprotection_errors.js
+++ devtools/client/webconsole/test/mochitest/browser_webconsole_trackingprotection_errors.js
@@ -9,17 +9,17 @@
"use strict";
const TEST_URI = "http://tracking.example.org/browser/devtools/client/" +
"webconsole/test/mochitest/" +
"test-trackingprotection-securityerrors.html";
const LEARN_MORE_URI = "https://developer.mozilla.org/Firefox/Privacy/" +
"Tracking_Protection" + DOCS_GA_PARAMS;
-const {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
+const {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm");
registerCleanupFunction(function() {
UrlClassifierTestUtils.cleanupTestTrackers();
});
add_task(async function testMessagesAppear() {
await UrlClassifierTestUtils.addTestTrackers();
await pushPref("privacy.trackingprotection.enabled", true);
diff --git devtools/client/webconsole/test/unit/test_webconsole_l10n.js devtools/client/webconsole/test/unit/test_webconsole_l10n.js
--- devtools/client/webconsole/test/unit/test_webconsole_l10n.js
+++ devtools/client/webconsole/test/unit/test_webconsole_l10n.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
function run_test() {
const TEST_TIMESTAMP = 12345678;
const WCUL10n = require("devtools/client/webconsole/webconsole-l10n");
const date = new Date(TEST_TIMESTAMP);
const localizedString = WCUL10n.timestampString(TEST_TIMESTAMP);
ok(localizedString.includes(date.getHours()),
"the localized timestamp contains the hours");
diff --git devtools/client/webide/content/addons.js devtools/client/webide/content/addons.js
--- devtools/client/webide/content/addons.js
+++ devtools/client/webide/content/addons.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const {loader, require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {loader, require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const Services = require("Services");
const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties");
const {gDevTools} = require("devtools/client/framework/devtools");
loader.lazyRequireGetter(this, "adbAddon", "devtools/shared/adb/adb-addon", true);
diff --git devtools/client/webide/content/details.js devtools/client/webide/content/details.js
--- devtools/client/webide/content/details.js
+++ devtools/client/webide/content/details.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {AppManager} = require("devtools/client/webide/modules/app-manager");
window.addEventListener("load", function() {
document.addEventListener("visibilitychange", updateUI, true);
AppManager.on("app-manager-update", onAppManagerUpdate);
updateUI();
}, {capture: true, once: true});
diff --git devtools/client/webide/content/devicepreferences.js devtools/client/webide/content/devicepreferences.js
--- devtools/client/webide/content/devicepreferences.js
+++ devtools/client/webide/content/devicepreferences.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {AppManager} = require("devtools/client/webide/modules/app-manager");
const {Connection} = require("devtools/shared/client/connection-manager");
const ConfigView = require("devtools/client/webide/modules/config-view");
var configView = new ConfigView(window);
window.addEventListener("load", function() {
AppManager.on("app-manager-update", OnAppManagerUpdate);
diff --git devtools/client/webide/content/newapp.js devtools/client/webide/content/newapp.js
--- devtools/client/webide/content/newapp.js
+++ devtools/client/webide/content/newapp.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const Services = require("Services");
const {FileUtils} = require("resource://gre/modules/FileUtils.jsm");
const {AppProjects} = require("devtools/client/webide/modules/app-projects");
const {AppManager} = require("devtools/client/webide/modules/app-manager");
const {getJSON} = require("devtools/client/shared/getjson");
ChromeUtils.defineModuleGetter(this, "ZipUtils", "resource://gre/modules/ZipUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Downloads", "resource://gre/modules/Downloads.jsm");
diff --git devtools/client/webide/content/prefs.js devtools/client/webide/content/prefs.js
--- devtools/client/webide/content/prefs.js
+++ devtools/client/webide/content/prefs.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
window.addEventListener("load", function() {
// Listen to preference changes
const inputs = document.querySelectorAll("[data-pref]");
for (const i of inputs) {
const pref = i.dataset.pref;
Services.prefs.addObserver(pref, FillForm);
i.addEventListener("change", SaveForm);
diff --git devtools/client/webide/content/project-listing.js devtools/client/webide/content/project-listing.js
--- devtools/client/webide/content/project-listing.js
+++ devtools/client/webide/content/project-listing.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* eslint-env browser */
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const ProjectList = require("devtools/client/webide/modules/project-list");
var projectList = new ProjectList(window, window.parent);
window.addEventListener("load", function() {
document.getElementById("new-app").onclick = CreateNewApp;
document.getElementById("hosted-app").onclick = ImportHostedApp;
document.getElementById("packaged-app").onclick = ImportPackagedApp;
diff --git devtools/client/webide/content/runtime-listing.js devtools/client/webide/content/runtime-listing.js
--- devtools/client/webide/content/runtime-listing.js
+++ devtools/client/webide/content/runtime-listing.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const RuntimeList = require("devtools/client/webide/modules/runtime-list");
var runtimeList = new RuntimeList(window, window.parent);
window.addEventListener("load", function() {
document.getElementById("runtime-screenshot").onclick = TakeScreenshot;
document.getElementById("runtime-details").onclick = ShowRuntimeDetails;
document.getElementById("runtime-disconnect").onclick = DisconnectRuntime;
diff --git devtools/client/webide/content/runtimedetails.js devtools/client/webide/content/runtimedetails.js
--- devtools/client/webide/content/runtimedetails.js
+++ devtools/client/webide/content/runtimedetails.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {AppManager} = require("devtools/client/webide/modules/app-manager");
const {Connection} = require("devtools/shared/client/connection-manager");
window.addEventListener("load", function() {
document.querySelector("#close").onclick = CloseUI;
AppManager.on("app-manager-update", OnAppManagerUpdate);
BuildUI();
}, {capture: true, once: true});
diff --git devtools/client/webide/content/webide.js devtools/client/webide/content/webide.js
--- devtools/client/webide/content/webide.js
+++ devtools/client/webide/content/webide.js
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// These files are loaded via webide.xul
/* import-globals-from project-panel.js */
/* import-globals-from runtime-panel.js */
-const {loader, require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {loader, require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {gDevTools} = require("devtools/client/framework/devtools");
const {gDevToolsBrowser} = require("devtools/client/framework/devtools-browser");
const {Toolbox} = require("devtools/client/framework/toolbox");
const Services = require("Services");
const {AppProjects} = require("devtools/client/webide/modules/app-projects");
const {Connection} = require("devtools/shared/client/connection-manager");
const {AppManager} = require("devtools/client/webide/modules/app-manager");
const EventEmitter = require("devtools/shared/event-emitter");
diff --git devtools/client/webide/content/wifi-auth.js devtools/client/webide/content/wifi-auth.js
--- devtools/client/webide/content/wifi-auth.js
+++ devtools/client/webide/content/wifi-auth.js
@@ -1,16 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const { require } =
- ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const QR = require("devtools/shared/qrcode/index");
window.addEventListener("load", function() {
document.getElementById("close").onclick = () => window.close();
document.getElementById("no-scanner").onclick = showToken;
document.getElementById("yes-scanner").onclick = hideToken;
buildUI();
}, {once: true});
diff --git devtools/client/webide/test/head.js devtools/client/webide/test/head.js
--- devtools/client/webide/test/head.js
+++ devtools/client/webide/test/head.js
@@ -1,15 +1,15 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
+var {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
const { FileUtils } = require("resource://gre/modules/FileUtils.jsm");
const { gDevTools } = require("devtools/client/framework/devtools");
const Services = require("Services");
const { AppProjects } = require("devtools/client/webide/modules/app-projects");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
const { DebuggerServer } = require("devtools/server/main");
var TEST_BASE;
diff --git devtools/client/webide/test/test_app_validator.html devtools/client/webide/test/test_app_validator.html
--- devtools/client/webide/test/test_app_validator.html
+++ devtools/client/webide/test/test_app_validator.html
@@ -9,18 +9,18 @@
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<script type="application/javascript">
- ChromeUtils.import("resource://testing-common/httpd.js");
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js");
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {AppValidator} = require("devtools/client/webide/modules/app-validator");
const Services = require("Services");
const nsFile = Components.Constructor("@mozilla.org/file/local;1",
"nsIFile", "initWithPath");
const strings = Services.strings.createBundle("chrome://devtools/locale/app-manager.properties");
let httpserver, fakeOrigin;
diff --git devtools/client/webide/test/test_manifestUpdate.html devtools/client/webide/test/test_manifestUpdate.html
--- devtools/client/webide/test/test_manifestUpdate.html
+++ devtools/client/webide/test/test_manifestUpdate.html
@@ -13,17 +13,17 @@
</head>
<body>
<script type="application/javascript">
window.onload = function() {
SimpleTest.waitForExplicitFinish();
- const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm", {});
+ const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
(async function() {
const win = await openWebIDE();
const winProject = getProjectWindow(win);
const AppManager = win.AppManager;
function isProjectMarkedAsValid() {
const details = win.frames[1];
diff --git devtools/platform/tests/unit/test_nsjsinspector.js devtools/platform/tests/unit/test_nsjsinspector.js
--- devtools/platform/tests/unit/test_nsjsinspector.js
+++ devtools/platform/tests/unit/test_nsjsinspector.js
@@ -2,17 +2,17 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Test the basic functionality of the nsIJSInspector component.
var gCount = 0;
const MAX = 10;
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
var inspector = Cc["@mozilla.org/jsinspector;1"].getService(Ci.nsIJSInspector);
// Emulate 10 simultaneously-debugged windows from 3 separate client connections.
var requestor = (count) => ({
url: "http://foo/bar/" + count,
connection: "conn" + (count % 3),
});
diff --git devtools/server/actors/replay/graphics.js devtools/server/actors/replay/graphics.js
--- devtools/server/actors/replay/graphics.js
+++ devtools/server/actors/replay/graphics.js
@@ -7,17 +7,17 @@
// This module defines the routines used when updating the graphics shown by a
// middleman process tab. Middleman processes have their own window/document
// which are connected to the compositor in the UI process in the usual way.
// We need to update the contents of the document to draw the raw graphics data
// provided by the child process.
"use strict";
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const CC = Components.Constructor;
// Create a sandbox with the resources we need. require() doesn't work here.
const sandbox = Cu.Sandbox(CC("@mozilla.org/systemprincipal;1", "nsIPrincipal")());
Cu.evalInSandbox(
"Components.utils.import('resource://gre/modules/jsdebugger.jsm');" +
"addDebuggerToGlobal(this);",
diff --git devtools/server/actors/webconsole/content-process-forward.js devtools/server/actors/webconsole/content-process-forward.js
--- devtools/server/actors/webconsole/content-process-forward.js
+++ devtools/server/actors/webconsole/content-process-forward.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "E10SUtils",
"resource://gre/modules/E10SUtils.jsm");
/*
* The message manager has an upper limit on message sizes that it can
* reliably forward to the parent so we limit the size of console log event
* messages that we forward here. The web console is local and receives the
diff --git devtools/server/socket/tests/test_websocket-server.html devtools/server/socket/tests/test_websocket-server.html
--- devtools/server/socket/tests/test_websocket-server.html
+++ devtools/server/socket/tests/test_websocket-server.html
@@ -8,17 +8,17 @@
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<script>
"use strict";
window.onload = function() {
const CC = Components.Constructor;
- const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const WebSocketServer = require("devtools/server/socket/websocket-server");
const ServerSocket = CC("@mozilla.org/network/server-socket;1",
"nsIServerSocket", "init");
add_task(async function() {
// Create a TCP server on auto-assigned port
const server = new ServerSocket(-1, true, -1);
diff --git devtools/server/startup/content-process.js devtools/server/startup/content-process.js
--- devtools/server/startup/content-process.js
+++ devtools/server/startup/content-process.js
@@ -9,22 +9,22 @@
/*
* Process script that listens for requests to start a `DebuggerServer` for an entire
* content process. Loaded into content processes by the main process during
* `DebuggerServer.connectToContentProcess`.
*
* The actual server startup itself is in a JSM so that code can be cached.
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
function onInit(message) {
// Only reply if we are in a real content process
if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) {
- const {init} = ChromeUtils.import("resource://devtools/server/startup/content-process.jsm", {});
+ const {init} = ChromeUtils.import("resource://devtools/server/startup/content-process.jsm");
init(message);
}
}
function onClose() {
removeMessageListener("debug:init-content-server", onInit);
removeMessageListener("debug:close-content-server", onClose);
}
diff --git devtools/server/startup/content-process.jsm devtools/server/startup/content-process.jsm
--- devtools/server/startup/content-process.jsm
+++ devtools/server/startup/content-process.jsm
@@ -21,17 +21,17 @@ function setupServer(mm) {
// Prevent spawning multiple server per process, even if the caller call us
// multiple times
if (gLoader) {
return gLoader;
}
// Lazy load Loader.jsm to prevent loading any devtools dependency too early.
const { DevToolsLoader } =
- ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ ChromeUtils.import("resource://devtools/shared/Loader.jsm");
// Init a custom, invisible DebuggerServer, in order to not pollute the
// debugger with all devtools modules, nor break the debugger itself with
// using it in the same process.
gLoader = new DevToolsLoader();
gLoader.invisibleToDebugger = true;
const { DebuggerServer } = gLoader.require("devtools/server/main");
diff --git devtools/server/startup/frame.js devtools/server/startup/frame.js
--- devtools/server/startup/frame.js
+++ devtools/server/startup/frame.js
@@ -12,17 +12,17 @@
* `DebuggerServer.connectToFrame`.
*/
try {
var chromeGlobal = this;
// Encapsulate in its own scope to allows loading this frame script more than once.
(function() {
- const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
const { dumpn } = DevToolsUtils;
const { DebuggerServer } = require("devtools/server/main");
const { ActorPool } = require("devtools/server/actors/common");
DebuggerServer.init();
// We want a special server without any root actor and only target-scoped actors.
diff --git devtools/server/tests/browser/browser_accessibility_infobar_show.js devtools/server/tests/browser/browser_accessibility_infobar_show.js
--- devtools/server/tests/browser/browser_accessibility_infobar_show.js
+++ devtools/server/tests/browser/browser_accessibility_infobar_show.js
@@ -7,17 +7,17 @@
// Checks for the AccessibleHighlighter's and XULWindowHighlighter's infobar components.
add_task(async function() {
await BrowserTestUtils.withNewTab({
gBrowser,
url: MAIN_DOMAIN + "doc_accessibility_infobar.html",
}, async function(browser) {
await ContentTask.spawn(browser, null, async function() {
- const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { HighlighterEnvironment } = require("devtools/server/actors/highlighters");
const { AccessibleHighlighter } = require("devtools/server/actors/highlighters/accessible");
const { XULWindowAccessibleHighlighter } = require("devtools/server/actors/highlighters/xul-accessible");
/**
* Get whether or not infobar container is hidden.
*
* @param {Object} infobar
diff --git devtools/server/tests/browser/browser_canvasframe_helper_01.js devtools/server/tests/browser/browser_canvasframe_helper_01.js
--- devtools/server/tests/browser/browser_canvasframe_helper_01.js
+++ devtools/server/tests/browser/browser_canvasframe_helper_01.js
@@ -7,17 +7,17 @@
// Simple CanvasFrameAnonymousContentHelper tests.
const TEST_URL = "data:text/html;charset=utf-8,CanvasFrameAnonymousContentHelper test";
add_task(async function() {
const browser = await addTab(TEST_URL);
await ContentTask.spawn(browser, null, async function() {
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {HighlighterEnvironment} = require("devtools/server/actors/highlighters");
const {
CanvasFrameAnonymousContentHelper,
} = require("devtools/server/actors/highlighters/utils/markup");
const doc = content.document;
const nodeBuilder = () => {
const root = doc.createElement("div");
diff --git devtools/server/tests/browser/browser_canvasframe_helper_02.js devtools/server/tests/browser/browser_canvasframe_helper_02.js
--- devtools/server/tests/browser/browser_canvasframe_helper_02.js
+++ devtools/server/tests/browser/browser_canvasframe_helper_02.js
@@ -6,17 +6,17 @@
// Test that the CanvasFrameAnonymousContentHelper does not insert content in
// XUL windows.
add_task(async function() {
const browser = await addTab("about:preferences");
await ContentTask.spawn(browser, null, async function() {
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {HighlighterEnvironment} = require("devtools/server/actors/highlighters");
const {
CanvasFrameAnonymousContentHelper,
} = require("devtools/server/actors/highlighters/utils/markup");
const doc = content.document;
const nodeBuilder = () => {
const root = doc.createElement("div");
diff --git devtools/server/tests/browser/browser_canvasframe_helper_03.js devtools/server/tests/browser/browser_canvasframe_helper_03.js
--- devtools/server/tests/browser/browser_canvasframe_helper_03.js
+++ devtools/server/tests/browser/browser_canvasframe_helper_03.js
@@ -6,17 +6,17 @@
// Test the CanvasFrameAnonymousContentHelper event handling mechanism.
const TEST_URL = "data:text/html;charset=utf-8,CanvasFrameAnonymousContentHelper test";
add_task(async function() {
const browser = await addTab(TEST_URL);
await ContentTask.spawn(browser, null, async function() {
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {HighlighterEnvironment} = require("devtools/server/actors/highlighters");
const {
CanvasFrameAnonymousContentHelper,
} = require("devtools/server/actors/highlighters/utils/markup");
const doc = content.document;
const nodeBuilder = () => {
const root = doc.createElement("div");
diff --git devtools/server/tests/browser/browser_canvasframe_helper_04.js devtools/server/tests/browser/browser_canvasframe_helper_04.js
--- devtools/server/tests/browser/browser_canvasframe_helper_04.js
+++ devtools/server/tests/browser/browser_canvasframe_helper_04.js
@@ -11,17 +11,17 @@ const TEST_URL_1 =
"data:text/html;charset=utf-8,CanvasFrameAnonymousContentHelper test 1";
const TEST_URL_2 =
"data:text/html;charset=utf-8,CanvasFrameAnonymousContentHelper test 2";
add_task(async function() {
const browser = await addTab(TEST_URL_1);
await injectEventUtilsInContentTask(browser);
await ContentTask.spawn(browser, TEST_URL_2, async function(url2) {
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {HighlighterEnvironment} = require("devtools/server/actors/highlighters");
const {
CanvasFrameAnonymousContentHelper,
} = require("devtools/server/actors/highlighters/utils/markup");
let doc = content.document;
const nodeBuilder = () => {
const root = doc.createElement("div");
diff --git devtools/server/tests/browser/browser_canvasframe_helper_05.js devtools/server/tests/browser/browser_canvasframe_helper_05.js
--- devtools/server/tests/browser/browser_canvasframe_helper_05.js
+++ devtools/server/tests/browser/browser_canvasframe_helper_05.js
@@ -7,17 +7,17 @@
// Test some edge cases of the CanvasFrameAnonymousContentHelper event handling
// mechanism.
const TEST_URL = "data:text/html;charset=utf-8,CanvasFrameAnonymousContentHelper test";
add_task(async function() {
const browser = await addTab(TEST_URL);
await ContentTask.spawn(browser, null, async function() {
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {HighlighterEnvironment} = require("devtools/server/actors/highlighters");
const {
CanvasFrameAnonymousContentHelper,
} = require("devtools/server/actors/highlighters/utils/markup");
const doc = content.document;
const nodeBuilder = () => {
const root = doc.createElement("div");
diff --git devtools/server/tests/browser/browser_canvasframe_helper_06.js devtools/server/tests/browser/browser_canvasframe_helper_06.js
--- devtools/server/tests/browser/browser_canvasframe_helper_06.js
+++ devtools/server/tests/browser/browser_canvasframe_helper_06.js
@@ -7,17 +7,17 @@
// Test support for event propagation stop in the
// CanvasFrameAnonymousContentHelper event handling mechanism.
const TEST_URL = "data:text/html;charset=utf-8,CanvasFrameAnonymousContentHelper test";
add_task(async function() {
const browser = await addTab(TEST_URL);
await ContentTask.spawn(browser, null, async function() {
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {HighlighterEnvironment} = require("devtools/server/actors/highlighters");
const {
CanvasFrameAnonymousContentHelper,
} = require("devtools/server/actors/highlighters/utils/markup");
const doc = content.document;
const nodeBuilder = () => {
const root = doc.createElement("div");
diff --git devtools/server/tests/browser/browser_navigateEvents.js devtools/server/tests/browser/browser_navigateEvents.js
--- devtools/server/tests/browser/browser_navigateEvents.js
+++ devtools/server/tests/browser/browser_navigateEvents.js
@@ -118,17 +118,17 @@ add_task(async function() {
});
// Listen for messages sent by the content task
browser.messageManager.addMessageListener("devtools-test:event", onMessage);
const tab = gBrowser.getTabForBrowser(browser);
const { target, actorID } = await connectAndAttachTab(tab);
await ContentTask.spawn(browser, [actorID], async function(actorId) {
- const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { DebuggerServer } = require("devtools/server/main");
const EventEmitter = require("devtools/shared/event-emitter");
// !Hack! Retrieve a server side object, the FrameTargetActor instance
const targetActor = DebuggerServer.searchAllConnectionsForActor(actorId);
// In order to listen to internal will-navigate/navigate events
EventEmitter.on(targetActor, "will-navigate", function(data) {
sendSyncMessage("devtools-test:event", {
diff --git devtools/server/tests/mochitest/framerate-helpers.js devtools/server/tests/mochitest/framerate-helpers.js
--- devtools/server/tests/mochitest/framerate-helpers.js
+++ devtools/server/tests/mochitest/framerate-helpers.js
@@ -1,11 +1,11 @@
/* exported getTargetForSelectedTab, waitFor, plotFPS */
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {TargetFactory} = require("devtools/client/framework/target");
const Services = require("Services");
// Always log packets when running tests.
Services.prefs.setBoolPref("devtools.debugger.log", true);
SimpleTest.registerCleanupFunction(function() {
Services.prefs.clearUserPref("devtools.debugger.log");
});
diff --git devtools/server/tests/mochitest/inspector-helpers.js devtools/server/tests/mochitest/inspector-helpers.js
--- devtools/server/tests/mochitest/inspector-helpers.js
+++ devtools/server/tests/mochitest/inspector-helpers.js
@@ -1,15 +1,15 @@
/* exported attachURL, promiseDone, assertOwnershipTrees, checkMissing, checkAvailable,
promiseOnce, isSrcChange, isUnretained, isNewRoot, assertSrcChange, assertUnload,
assertFrameLoad, assertChildList, waitForMutation, addTest, addAsyncTest,
runNextTest */
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {TargetFactory} = require("devtools/client/framework/target");
const {DebuggerServer} = require("devtools/server/main");
const {BrowserTestUtils} = require("resource://testing-common/BrowserTestUtils.jsm");
const Services = require("Services");
const {DocumentWalker: _documentWalker} = require("devtools/server/actors/inspector/document-walker");
// Always log packets when running tests.
diff --git devtools/server/tests/mochitest/memory-helpers.js devtools/server/tests/mochitest/memory-helpers.js
--- devtools/server/tests/mochitest/memory-helpers.js
+++ devtools/server/tests/mochitest/memory-helpers.js
@@ -1,13 +1,13 @@
/* exported Task, startServerAndGetSelectedTabMemory, destroyServerAndFinish,
waitForTime, waitUntil */
"use strict";
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const Services = require("Services");
const { TargetFactory } = require("devtools/client/framework/target");
// Always log packets when running tests.
Services.prefs.setBoolPref("devtools.debugger.log", true);
var gReduceTimePrecision = Services.prefs.getBoolPref("privacy.reduceTimerPrecision");
Services.prefs.setBoolPref("privacy.reduceTimerPrecision", false);
SimpleTest.registerCleanupFunction(function() {
diff --git devtools/server/tests/mochitest/test_Debugger.Script.prototype.global.html devtools/server/tests/mochitest/test_Debugger.Script.prototype.global.html
--- devtools/server/tests/mochitest/test_Debugger.Script.prototype.global.html
+++ devtools/server/tests/mochitest/test_Debugger.Script.prototype.global.html
@@ -11,17 +11,17 @@ Debugger.Script.prototype.global should
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<pre id="test">
<script>
"use strict";
-ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
+const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
addDebuggerToGlobal(this);
window.onload = function() {
SimpleTest.waitForExplicitFinish();
const iframe = document.createElement("iframe");
iframe.src = "data:text/html,<script>function glorp() { }<\/script>";
iframe.onload = firstOnLoadHandler;
diff --git devtools/server/tests/mochitest/test_Debugger.Source.prototype.element.html devtools/server/tests/mochitest/test_Debugger.Source.prototype.element.html
--- devtools/server/tests/mochitest/test_Debugger.Source.prototype.element.html
+++ devtools/server/tests/mochitest/test_Debugger.Source.prototype.element.html
@@ -12,17 +12,17 @@ element to which code is attached (if an
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<pre id="test">
<script>
"use strict";
-ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
+const {addSandboxedDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
addSandboxedDebuggerToGlobal(this);
window.onload = function() {
SimpleTest.waitForExplicitFinish();
let log = "";
let doc, dieter, ulrich, isolde, albrecht;
let dbg, iframeDO, DOFor;
diff --git devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionScript.html devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionScript.html
--- devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionScript.html
+++ devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionScript.html
@@ -12,17 +12,17 @@ behave when 'eval' is called with no scr
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<pre id="test">
<script>
"use strict";
-ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
+const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
addDebuggerToGlobal(this);
window.onload = function() {
SimpleTest.waitForExplicitFinish();
let dbg, iframeDO, doc, script2DO;
// Create an iframe to debug.
diff --git devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html
--- devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html
+++ devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html
@@ -13,17 +13,17 @@ JavaScrip appearing in an inline event h
<script type="application/javascript" src="inspector-helpers.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<pre id="test">
<script>
"use strict";
-ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
+const {addSandboxedDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
addSandboxedDebuggerToGlobal(this);
let dbg;
let iframeDO, doc;
let Tootles, TootlesDO;
window.onload = function() {
SimpleTest.waitForExplicitFinish();
diff --git devtools/server/tests/mochitest/test_animation-type-longhand.html devtools/server/tests/mochitest/test_animation-type-longhand.html
--- devtools/server/tests/mochitest/test_animation-type-longhand.html
+++ devtools/server/tests/mochitest/test_animation-type-longhand.html
@@ -6,17 +6,17 @@
<script>
"use strict";
// This test checks the content of animation type for longhands table that
// * every longhand property is included
// * nothing else is included
// * no property is mapped to more than one animation type
window.onload = function() {
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { ANIMATION_TYPE_FOR_LONGHANDS } =
require("devtools/server/actors/animation-type-longhand");
const InspectorUtils = SpecialPowers.InspectorUtils;
const all_longhands = InspectorUtils.getCSSPropertyNames({
includeShorthands: false,
includeExperimentals: true,
});
diff --git devtools/server/tests/mochitest/test_connectToFrame.html devtools/server/tests/mochitest/test_connectToFrame.html
--- devtools/server/tests/mochitest/test_connectToFrame.html
+++ devtools/server/tests/mochitest/test_connectToFrame.html
@@ -12,17 +12,17 @@ Bug 966991 - Test DebuggerServer.connect
<body>
<pre id="test">
<script type="application/javascript">
"use strict";
// Part of this is a frame script.
/* eslint-env mozilla/frame-script */
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DebuggerServer } = require("devtools/server/main");
window.onload = function() {
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({
"set": [
@@ -40,17 +40,17 @@ function runTests() {
document.body.appendChild(iframe);
const mm = iframe.QueryInterface(Ci.nsIFrameLoaderOwner).frameLoader.messageManager;
// Register a test actor in the child process so that we can know if and when
// this fake actor is destroyed.
mm.loadFrameScript("data:text/javascript,new " + function FrameScriptScope() {
/* eslint-disable no-shadow */
- const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { DebuggerServer } = require("devtools/server/main");
const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
/* eslint-enable no-shadow */
DebuggerServer.init();
function TestActor() {
dump("instanciate test actor\n");
diff --git devtools/server/tests/mochitest/test_connection-manager.html devtools/server/tests/mochitest/test_connection-manager.html
--- devtools/server/tests/mochitest/test_connection-manager.html
+++ devtools/server/tests/mochitest/test_connection-manager.html
@@ -12,17 +12,17 @@ Bug 898485 - [app manager] Implement an
<body>
<pre id="test">
<script>
"use strict";
window.onload = function() {
SimpleTest.waitForExplicitFinish();
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {DebuggerServer} = require("devtools/server/main");
const Services = require("Services");
DebuggerServer.init();
DebuggerServer.registerAllActors();
const {
ConnectionManager,
diff --git devtools/server/tests/mochitest/test_css-logic-media-queries.html devtools/server/tests/mochitest/test_css-logic-media-queries.html
--- devtools/server/tests/mochitest/test_css-logic-media-queries.html
+++ devtools/server/tests/mochitest/test_css-logic-media-queries.html
@@ -23,17 +23,17 @@ Test that css-logic handles media-querie
</style>
</head>
<body>
<div></div>
<script type="application/javascript">
"use strict";
window.onload = function() {
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const Services = require("Services");
const {CssLogic} = require("devtools/server/actors/inspector/css-logic");
const InspectorUtils = require("InspectorUtils");
SimpleTest.waitForExplicitFinish();
const div = document.querySelector("div");
const cssLogic = new CssLogic(InspectorUtils.isInheritedProperty);
diff --git devtools/server/tests/mochitest/test_css-logic-specificity.html devtools/server/tests/mochitest/test_css-logic-specificity.html
--- devtools/server/tests/mochitest/test_css-logic-specificity.html
+++ devtools/server/tests/mochitest/test_css-logic-specificity.html
@@ -8,17 +8,17 @@ Test that css-logic calculates CSS speci
<title>Test css-logic specificity</title>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
</head>
<body style="background:blue;">
<script type="application/javascript">
"use strict";
window.onload = function() {
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {CssLogic, CssSelector} = require("devtools/server/actors/inspector/css-logic");
const InspectorUtils = SpecialPowers.InspectorUtils;
const TEST_DATA = [
{text: "*", expected: 0},
{text: "LI", expected: 1},
{text: "UL LI", expected: 2},
{text: "UL OL + LI", expected: 3},
diff --git devtools/server/tests/mochitest/test_device.html devtools/server/tests/mochitest/test_device.html
--- devtools/server/tests/mochitest/test_device.html
+++ devtools/server/tests/mochitest/test_device.html
@@ -10,17 +10,17 @@ Bug 895360 - [app manager] Device meta d
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<pre id="test">
<script>
"use strict";
window.onload = function() {
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {DebuggerClient} = require("devtools/shared/client/debugger-client");
const {DebuggerServer} = require("devtools/server/main");
const Services = require("Services");
SimpleTest.waitForExplicitFinish();
DebuggerServer.init();
DebuggerServer.registerAllActors();
diff --git devtools/server/tests/mochitest/test_executeInGlobal-outerized_this.html devtools/server/tests/mochitest/test_executeInGlobal-outerized_this.html
--- devtools/server/tests/mochitest/test_executeInGlobal-outerized_this.html
+++ devtools/server/tests/mochitest/test_executeInGlobal-outerized_this.html
@@ -13,17 +13,17 @@ object.
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<pre id="test">
<script>
"use strict";
-ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
+const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
addDebuggerToGlobal(this);
window.onload = function() {
SimpleTest.waitForExplicitFinish();
const iframe = document.createElement("iframe");
iframe.src = "data:text/html,<script>var me = 'page 1';<\/script>";
iframe.onload = firstOnLoadHandler;
diff --git devtools/server/tests/mochitest/test_getProcess.html devtools/server/tests/mochitest/test_getProcess.html
--- devtools/server/tests/mochitest/test_getProcess.html
+++ devtools/server/tests/mochitest/test_getProcess.html
@@ -12,17 +12,17 @@ Bug 1060093 - Test DebuggerServer.getPro
<body>
<pre id="test">
<script type="application/javascript">
"use strict";
// Part of this is a frame script.
/* eslint-env mozilla/frame-script */
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {DebuggerClient} = require("devtools/shared/client/debugger-client");
const {DebuggerServer} = require("devtools/server/main");
const Services = require("Services");
window.onload = function() {
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({
@@ -111,17 +111,17 @@ function runTests() {
const actor = front.targetForm;
is(actor, firstActor,
"Second call to getProcess with the same id returns the same form");
closeClient();
});
}
function processScript() {
- ChromeUtils.import("resource://gre/modules/Services.jsm");
+ const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const listener = function() {
Services.obs.removeObserver(listener, "devtools:loader:destroy");
sendAsyncMessage("test:getProcess-destroy", null);
};
Services.obs.addObserver(listener, "devtools:loader:destroy");
}
function closeClient() {
diff --git devtools/server/tests/mochitest/test_highlighter_paused_debugger.html devtools/server/tests/mochitest/test_highlighter_paused_debugger.html
--- devtools/server/tests/mochitest/test_highlighter_paused_debugger.html
+++ devtools/server/tests/mochitest/test_highlighter_paused_debugger.html
@@ -12,17 +12,17 @@ Test the PausedDebuggerOverlay highlight
<body>
<pre id="test">
<script>
"use strict";
window.onload = function() {
SimpleTest.waitForExplicitFinish();
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
require("devtools/server/actors/inspector/inspector");
const {HighlighterEnvironment} = require("devtools/server/actors/highlighters");
const {PausedDebuggerOverlay} = require("devtools/server/actors/highlighters/paused-debugger");
const env = new HighlighterEnvironment();
env.initFromWindow(window);
const highlighter = new PausedDebuggerOverlay(env);
diff --git devtools/server/tests/mochitest/test_inspector-search.html devtools/server/tests/mochitest/test_inspector-search.html
--- devtools/server/tests/mochitest/test_inspector-search.html
+++ devtools/server/tests/mochitest/test_inspector-search.html
@@ -8,17 +8,17 @@ https://bugzilla.mozilla.org/show_bug.cg
<title>Test for Bug 835896</title>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
<script type="application/javascript" src="inspector-helpers.js"></script>
<script type="application/javascript">
"use strict";
window.onload = function() {
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {WalkerSearch, WalkerIndex} =
require("devtools/server/actors/utils/walker-search");
SimpleTest.waitForExplicitFinish();
let walkerActor = null;
let walkerSearch = null;
let inspectee = null;
diff --git devtools/server/tests/mochitest/test_makeGlobalObjectReference.html devtools/server/tests/mochitest/test_makeGlobalObjectReference.html
--- devtools/server/tests/mochitest/test_makeGlobalObjectReference.html
+++ devtools/server/tests/mochitest/test_makeGlobalObjectReference.html
@@ -12,17 +12,17 @@ Debugger.prototype.makeGlobalObjectRefer
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<pre id="test">
<script>
"use strict";
-ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
+const {addSandboxedDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
addSandboxedDebuggerToGlobal(this);
window.onload = function() {
SimpleTest.waitForExplicitFinish();
// Load one of our iframes over http to force it in a different compartment
// from the current window and the other iframe.
const iframe = document.createElement("iframe");
diff --git devtools/server/tests/mochitest/test_preference.html devtools/server/tests/mochitest/test_preference.html
--- devtools/server/tests/mochitest/test_preference.html
+++ devtools/server/tests/mochitest/test_preference.html
@@ -10,17 +10,17 @@ Bug 943251 - Allow accessing about:confi
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<pre id="test">
<script>
"use strict";
function runTests() {
- const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {DebuggerClient} = require("devtools/shared/client/debugger-client");
const {DebuggerServer} = require("devtools/server/main");
const Services = require("Services");
SimpleTest.waitForExplicitFinish();
DebuggerServer.init();
DebuggerServer.registerAllActors();
diff --git devtools/server/tests/mochitest/test_setupInParentChild.html devtools/server/tests/mochitest/test_setupInParentChild.html
--- devtools/server/tests/mochitest/test_setupInParentChild.html
+++ devtools/server/tests/mochitest/test_setupInParentChild.html
@@ -9,17 +9,17 @@ Bug 1181100 - Test DebuggerServerConnect
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<pre id="test">
<script type="application/javascript">
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {DebuggerClient} = require("devtools/shared/client/debugger-client");
const {DebuggerServer} = require("devtools/server/main");
const Services = require("Services");
window.onload = function() {
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({
diff --git devtools/server/tests/mochitest/test_unsafeDereference.html devtools/server/tests/mochitest/test_unsafeDereference.html
--- devtools/server/tests/mochitest/test_unsafeDereference.html
+++ devtools/server/tests/mochitest/test_unsafeDereference.html
@@ -13,17 +13,17 @@ xray wrapper.
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<pre id="test">
<script>
"use strict";
-ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
+const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
addDebuggerToGlobal(this);
window.onload = function() {
SimpleTest.waitForExplicitFinish();
const iframe = document.createElement("iframe");
iframe.src = "http://mochi.test:8888/chrome/devtools/server/tests/mochitest/nonchrome_unsafeDereference.html";
diff --git devtools/server/tests/mochitest/webconsole-helpers.js devtools/server/tests/mochitest/webconsole-helpers.js
--- devtools/server/tests/mochitest/webconsole-helpers.js
+++ devtools/server/tests/mochitest/webconsole-helpers.js
@@ -1,12 +1,12 @@
/* exported attachURL, evaluateJS */
"use strict";
-const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {DebuggerServer} = require("devtools/server/main");
const {TargetFactory} = require("devtools/client/framework/target");
const Services = require("Services");
// Always log packets when running tests.
Services.prefs.setBoolPref("devtools.debugger.log", true);
SimpleTest.registerCleanupFunction(function() {
diff --git devtools/server/tests/mochitest/webextension-helpers.js devtools/server/tests/mochitest/webextension-helpers.js
--- devtools/server/tests/mochitest/webextension-helpers.js
+++ devtools/server/tests/mochitest/webextension-helpers.js
@@ -1,16 +1,16 @@
/* exported attachAddon, setWebExtensionOOPMode, waitForFramesUpdated, reloadAddon,
collectFrameUpdates, generateWebExtensionXPI, promiseInstallFile,
promiseAddonByID, promiseWebExtensionStartup, promiseWebExtensionShutdown
*/
"use strict";
-const {require, loader} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const {require, loader} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {DebuggerClient} = require("devtools/shared/client/debugger-client");
const {DebuggerServer} = require("devtools/server/main");
const {TargetFactory} = require("devtools/client/framework/target");
const {AddonManager} = require("resource://gre/modules/AddonManager.jsm");
const {Extension, Management} = require("resource://gre/modules/Extension.jsm");
const {flushJarCache} = require("resource://gre/modules/ExtensionUtils.jsm");
const {Services} = require("resource://gre/modules/Services.jsm");
diff --git devtools/server/tests/unit/head_dbg.js devtools/server/tests/unit/head_dbg.js
--- devtools/server/tests/unit/head_dbg.js
+++ devtools/server/tests/unit/head_dbg.js
@@ -13,18 +13,18 @@ ChromeUtils.import("resource://testing-c
_appInfo.updateAppInfo({
ID: "devtools@tests.mozilla.org",
name: "devtools-tests",
version: "1",
platformVersion: "42",
crashReporter: true,
});
-const { require, loader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
-const { worker } = ChromeUtils.import("resource://devtools/shared/worker/loader.js", {});
+const { require, loader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
+const { worker } = ChromeUtils.import("resource://devtools/shared/worker/loader.js");
const defer = require("devtools/shared/defer");
const { NetUtil } = require("resource://gre/modules/NetUtil.jsm");
const Services = require("Services");
// Always log packets when running tests. runxpcshelltests.py will throw
// the output away anyway, unless you give it the --verbose flag.
Services.prefs.setBoolPref("devtools.debugger.log", true);
// Enable remote debugging for the relevant tests.
@@ -33,17 +33,17 @@ Services.prefs.setBoolPref("devtools.deb
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
const { DebuggerServer } = require("devtools/server/main");
const { DebuggerServer: WorkerDebuggerServer } = worker.require("devtools/server/main");
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const ObjectClient = require("devtools/shared/client/object-client");
const {TargetFactory} = require("devtools/client/framework/target");
-const { addDebuggerToGlobal } = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm", {});
+const { addDebuggerToGlobal } = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const systemPrincipal = Cc["@mozilla.org/systemprincipal;1"]
.createInstance(Ci.nsIPrincipal);
var { loadSubScript, loadSubScriptWithOptions } = Services.scriptloader;
/**
* Initializes any test that needs to work with add-ons.
diff --git devtools/server/tests/unit/test_addon_reload.js devtools/server/tests/unit/test_addon_reload.js
--- devtools/server/tests/unit/test_addon_reload.js
+++ devtools/server/tests/unit/test_addon_reload.js
@@ -17,17 +17,17 @@ function promiseAddonEvent(event) {
},
};
AddonManager.addAddonListener(listener);
});
}
function promiseWebExtensionStartup() {
- const {Management} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
+ const {Management} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
return new Promise(resolve => {
const listener = (evt, extension) => {
Management.off("ready", listener);
resolve(extension);
};
Management.on("ready", listener);
diff --git devtools/server/tests/unit/test_getyoungestframe.js devtools/server/tests/unit/test_getyoungestframe.js
--- devtools/server/tests/unit/test_getyoungestframe.js
+++ devtools/server/tests/unit/test_getyoungestframe.js
@@ -1,15 +1,15 @@
/* eslint-disable strict */
function run_test() {
Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
registerCleanupFunction(() => {
Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
});
- ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
+ const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
addDebuggerToGlobal(this);
const xpcInspector = Cc["@mozilla.org/jsinspector;1"].getService(Ci.nsIJSInspector);
const g = testGlobal("test1");
const dbg = new Debugger();
dbg.uncaughtExceptionHook = testExceptionHook;
dbg.addDebuggee(g);
diff --git devtools/server/tests/unit/test_nativewrappers.js devtools/server/tests/unit/test_nativewrappers.js
--- devtools/server/tests/unit/test_nativewrappers.js
+++ devtools/server/tests/unit/test_nativewrappers.js
@@ -1,15 +1,15 @@
/* eslint-disable strict */
function run_test() {
Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
registerCleanupFunction(() => {
Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
});
- ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
+ const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
addDebuggerToGlobal(this);
const g = testGlobal("test1");
const dbg = new Debugger();
dbg.addDebuggee(g);
dbg.onDebuggerStatement = function(frame) {
const args = frame.arguments;
try {
diff --git devtools/server/tests/unit/test_promises_object_timetosettle-02.js devtools/server/tests/unit/test_promises_object_timetosettle-02.js
--- devtools/server/tests/unit/test_promises_object_timetosettle-02.js
+++ devtools/server/tests/unit/test_promises_object_timetosettle-02.js
@@ -3,17 +3,17 @@
/* eslint-disable mozilla/no-arbitrary-setTimeout */
/**
* Test that we get the expected settlement time for promise time to settle.
*/
"use strict";
-const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm", {});
+const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
add_task(async function() {
const { promisesFront } = await createMainProcessPromisesFront();
ok(Promise.toString().includes("native code"), "Expect native DOM Promise.");
await testGetTimeToSettle(promisesFront,
v => new Promise(resolve => setTimeout(() => resolve(v), 100)));
diff --git devtools/server/tests/unit/test_safe-getter.js devtools/server/tests/unit/test_safe-getter.js
--- devtools/server/tests/unit/test_safe-getter.js
+++ devtools/server/tests/unit/test_safe-getter.js
@@ -1,11 +1,11 @@
/* eslint-disable strict */
function run_test() {
- ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
+ const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
addDebuggerToGlobal(this);
const g = testGlobal("test");
const dbg = new Debugger();
const gw = dbg.addDebuggee(g);
g.eval(`
// This is not a CCW.
Object.defineProperty(this, "bar", {
diff --git devtools/server/tests/unit/test_unsafeDereference.js devtools/server/tests/unit/test_unsafeDereference.js
--- devtools/server/tests/unit/test_unsafeDereference.js
+++ devtools/server/tests/unit/test_unsafeDereference.js
@@ -6,17 +6,17 @@
// Test Debugger.Object.prototype.unsafeDereference in the presence of
// interesting cross-compartment wrappers.
//
// This is not really a debugger server test; it's more of a Debugger test.
// But we need xpcshell and Components.utils.Sandbox to get
// cross-compartment wrappers with interesting properties, and this is the
// xpcshell test directory most closely related to the JS Debugger API.
-ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
+const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
addDebuggerToGlobal(this);
// Add a method to Debugger.Object for fetching value properties
// conveniently.
Debugger.Object.prototype.getProperty = function(name) {
const desc = this.getOwnPropertyDescriptor(name);
if (!desc) {
return undefined;
diff --git devtools/shared/Loader.jsm devtools/shared/Loader.jsm
--- devtools/shared/Loader.jsm
+++ devtools/shared/Loader.jsm
@@ -3,20 +3,20 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
/**
* Manages the base loader (base-loader.js) instance used to load the developer tools.
*/
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
+var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var { Loader, Require, resolveURI, unload } =
- ChromeUtils.import("resource://devtools/shared/base-loader.js", {});
-var { requireRawId } = ChromeUtils.import("resource://devtools/shared/loader-plugin-raw.jsm", {});
+ ChromeUtils.import("resource://devtools/shared/base-loader.js");
+var { requireRawId } = ChromeUtils.import("resource://devtools/shared/loader-plugin-raw.jsm");
this.EXPORTED_SYMBOLS = ["DevToolsLoader", "devtools", "BuiltinProvider",
"require", "loader",
// Export StructuredCloneHolder for its use from builtin-modules
"StructuredCloneHolder"];
/**
* Providers are different strategies for loading the devtools.
diff --git devtools/shared/Parser.jsm devtools/shared/Parser.jsm
--- devtools/shared/Parser.jsm
+++ devtools/shared/Parser.jsm
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
ChromeUtils.defineModuleGetter(this,
"Reflect", "resource://gre/modules/reflect.jsm");
this.EXPORTED_SYMBOLS = ["Parser", "ParserHelpers", "SyntaxTreeVisitor"];
diff --git devtools/shared/acorn/tests/unit/head_acorn.js devtools/shared/acorn/tests/unit/head_acorn.js
--- devtools/shared/acorn/tests/unit/head_acorn.js
+++ devtools/shared/acorn/tests/unit/head_acorn.js
@@ -1,10 +1,10 @@
"use strict";
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
function isObject(value) {
return typeof value === "object" && value !== null;
}
function intersect(a, b) {
const seen = new Set(a);
diff --git devtools/shared/adb/test/test_adb.js devtools/shared/adb/test/test_adb.js
--- devtools/shared/adb/test/test_adb.js
+++ devtools/shared/adb/test/test_adb.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { ExtensionTestUtils } = ChromeUtils.import("resource://testing-common/ExtensionXPCShellUtils.jsm", {});
+const { ExtensionTestUtils } = ChromeUtils.import("resource://testing-common/ExtensionXPCShellUtils.jsm");
const { NetUtil } = require("resource://gre/modules/NetUtil.jsm");
const { getFileForBinary } = require("devtools/shared/adb/adb-binary");
const { check } = require("devtools/shared/adb/adb-running-checker");
const { adbProcess } = require("devtools/shared/adb/adb-process");
const { TrackDevicesCommand } = require("devtools/shared/adb/commands/index");
const ADB_JSON = {
"Linux": {
diff --git devtools/shared/adb/test/xpcshell-head.js devtools/shared/adb/test/xpcshell-head.js
--- devtools/shared/adb/test/xpcshell-head.js
+++ devtools/shared/adb/test/xpcshell-head.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
/* eslint no-unused-vars: [2, {"vars": "local"}] */
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const Services = require("Services");
// ================================================
// Load mocking/stubbing library, sinon
// docs: http://sinonjs.org/releases/v2.3.2/
ChromeUtils.import("resource://gre/modules/Timer.jsm");
Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js", this);
/* globals sinon */
diff --git devtools/shared/base-loader.js devtools/shared/base-loader.js
--- devtools/shared/base-loader.js
+++ devtools/shared/base-loader.js
@@ -7,19 +7,19 @@
"use strict";
this.EXPORTED_SYMBOLS = ["Loader", "resolveURI", "Module", "Require", "unload"];
const { Constructor: CC, manager: Cm } = Components;
const systemPrincipal = CC("@mozilla.org/systemprincipal;1", "nsIPrincipal")();
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
-const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", {});
-const { normalize, dirname } = ChromeUtils.import("resource://gre/modules/osfile/ospath_unix.jsm", {});
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const { normalize, dirname } = ChromeUtils.import("resource://gre/modules/osfile/ospath_unix.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "resProto",
"@mozilla.org/network/protocol;1?name=resource",
"nsIResProtocolHandler");
ChromeUtils.defineModuleGetter(this, "NetUtil", "resource://gre/modules/NetUtil.jsm");
const { defineLazyGetter } = XPCOMUtils;
diff --git devtools/shared/builtin-modules.js devtools/shared/builtin-modules.js
--- devtools/shared/builtin-modules.js
+++ devtools/shared/builtin-modules.js
@@ -227,29 +227,29 @@ exports.modules = {
};
defineLazyGetter(exports.modules, "Debugger", () => {
const global = Cu.getGlobalForObject(this);
// Debugger may already have been added by RecordReplayControl getter
if (global.Debugger) {
return global.Debugger;
}
- const { addDebuggerToGlobal } = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm", {});
+ const { addDebuggerToGlobal } = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
addDebuggerToGlobal(global);
return global.Debugger;
});
defineLazyGetter(exports.modules, "RecordReplayControl", () => {
// addDebuggerToGlobal also adds the RecordReplayControl object.
const global = Cu.getGlobalForObject(this);
// RecordReplayControl may already have been added by Debugger getter
if (global.RecordReplayControl) {
return global.RecordReplayControl;
}
- const { addDebuggerToGlobal } = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm", {});
+ const { addDebuggerToGlobal } = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
addDebuggerToGlobal(global);
return global.RecordReplayControl;
});
defineLazyGetter(exports.modules, "Timer", () => {
const {setTimeout, clearTimeout} = require("resource://gre/modules/Timer.jsm");
// Do not return Cu.import result, as DevTools loader would freeze Timer.jsm globals...
return {
diff --git devtools/shared/css/generated/generate-properties-db.js devtools/shared/css/generated/generate-properties-db.js
--- devtools/shared/css/generated/generate-properties-db.js
+++ devtools/shared/css/generated/generate-properties-db.js
@@ -4,17 +4,17 @@
"use strict";
/*
* This is an xpcshell script that runs to generate a static list of CSS properties
* as known by the platform. It is run from ./mach_commands.py by running
* `mach devtools-css-db`.
*/
-var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
var {generateCssProperties} = require("devtools/server/actors/css-properties");
const InspectorUtils = require("InspectorUtils");
// xpcshell can output extra information, so place some delimiter text between
// the output of the css properties database.
dump("DEVTOOLS_CSS_DB_DELIMITER");
// Output JSON
diff --git devtools/shared/discovery/tests/unit/test_discovery.js devtools/shared/discovery/tests/unit/test_discovery.js
--- devtools/shared/discovery/tests/unit/test_discovery.js
+++ devtools/shared/discovery/tests/unit/test_discovery.js
@@ -1,21 +1,21 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
/* eslint-disable mozilla/no-arbitrary-setTimeout */
"use strict";
const { require } =
- ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const Services = require("Services");
const defer = require("devtools/shared/defer");
const EventEmitter = require("devtools/shared/event-emitter");
const discovery = require("devtools/shared/discovery/discovery");
-const { setTimeout, clearTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm", {});
+const { setTimeout, clearTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
Services.prefs.setBoolPref("devtools.discovery.log", true);
registerCleanupFunction(() => {
Services.prefs.clearUserPref("devtools.discovery.log");
});
function log(msg) {
diff --git devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.js devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.j
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment