corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 3 changesets (bug 1431533) for Android mochitest failures on testEventDispatcher on a CLOSED TREE

Browse Source 
Backed out changeset a1eca62826a1 (bug 1431533)
Backed out changeset 34c999fa006b (bug 1431533)
Backed out changeset e2674287e57f (bug 1431533)
This commit is contained in:
Cosmin Sabou
2018-01-30 07:17:48 +02:00
parent e558432368
commit f09d6d985d
2877 changed files with 8811 additions and 8974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
accessible/jsat/AccessFu.jsm
View File

@@ -10,11 +10,11 @@ const {utils: Cu, interfaces: Ci} = Components;
this.EXPORTED_SYMBOLS = ["AccessFu"]; // jshint ignore:line
ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/accessibility/Utils.jsm");
if (Utils.MozBuildApp === "mobile/android") {
ChromeUtils.import("resource://gre/modules/Messaging.jsm");
Cu.import("resource://gre/modules/Messaging.jsm");
}
const ACCESSFU_DISABLE = 0; // jshint ignore:line
@@ -79,9 +79,9 @@ this.AccessFu = { // jshint ignore:line
}
this._enabled = true;
ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.import("resource://gre/modules/accessibility/PointerAdapter.jsm");
ChromeUtils.import("resource://gre/modules/accessibility/Presentation.jsm");
Cu.import("resource://gre/modules/accessibility/Utils.jsm");
Cu.import("resource://gre/modules/accessibility/PointerAdapter.jsm");
Cu.import("resource://gre/modules/accessibility/Presentation.jsm");
for (let mm of Utils.AllMessageManagers) {
this._addMessageListeners(mm);
@@ -519,7 +519,7 @@ var Output = {
},
start: function start() {
ChromeUtils.import("resource://gre/modules/Geometry.jsm");
Cu.import("resource://gre/modules/Geometry.jsm");
},
stop: function stop() {

2
accessible/jsat/Constants.jsm
View File

@@ -1,7 +1,7 @@
const Ci = Components.interfaces;
const Cu = Components.utils;
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
this.EXPORTED_SYMBOLS = ["Roles", "Events", "Relations",
"Filters", "States", "Prefilters"];

16
accessible/jsat/ContentControl.jsm
View File

@@ -5,20 +5,20 @@
var Ci = Components.interfaces;
var Cu = Components.utils;
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Services",
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Services",
"resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "Utils",
XPCOMUtils.defineLazyModuleGetter(this, "Utils",
"resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "Logger",
XPCOMUtils.defineLazyModuleGetter(this, "Logger",
"resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "Roles",
XPCOMUtils.defineLazyModuleGetter(this, "Roles",
"resource://gre/modules/accessibility/Constants.jsm");
ChromeUtils.defineModuleGetter(this, "TraversalRules",
XPCOMUtils.defineLazyModuleGetter(this, "TraversalRules",
"resource://gre/modules/accessibility/Traversal.jsm");
ChromeUtils.defineModuleGetter(this, "TraversalHelper",
XPCOMUtils.defineLazyModuleGetter(this, "TraversalHelper",
"resource://gre/modules/accessibility/Traversal.jsm");
ChromeUtils.defineModuleGetter(this, "Presentation",
XPCOMUtils.defineLazyModuleGetter(this, "Presentation",
"resource://gre/modules/accessibility/Presentation.jsm");
this.EXPORTED_SYMBOLS = ["ContentControl"];

16
accessible/jsat/EventManager.jsm
View File

@@ -9,20 +9,20 @@ const Cu = Components.utils;
const TEXT_NODE = 3;
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Services",
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Services",
"resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "Utils",
XPCOMUtils.defineLazyModuleGetter(this, "Utils",
"resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "Logger",
XPCOMUtils.defineLazyModuleGetter(this, "Logger",
"resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "Presentation",
XPCOMUtils.defineLazyModuleGetter(this, "Presentation",
"resource://gre/modules/accessibility/Presentation.jsm");
ChromeUtils.defineModuleGetter(this, "Roles",
XPCOMUtils.defineLazyModuleGetter(this, "Roles",
"resource://gre/modules/accessibility/Constants.jsm");
ChromeUtils.defineModuleGetter(this, "Events",
XPCOMUtils.defineLazyModuleGetter(this, "Events",
"resource://gre/modules/accessibility/Constants.jsm");
ChromeUtils.defineModuleGetter(this, "States",
XPCOMUtils.defineLazyModuleGetter(this, "States",
"resource://gre/modules/accessibility/Constants.jsm");
this.EXPORTED_SYMBOLS = ["EventManager"];

12
accessible/jsat/Gestures.jsm
View File

@@ -40,17 +40,17 @@ const Cu = Components.utils;
this.EXPORTED_SYMBOLS = ["GestureSettings", "GestureTracker"]; // jshint ignore:line
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Utils", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "Utils", // jshint ignore:line
"resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "Logger", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "Logger", // jshint ignore:line
"resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "setTimeout", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "setTimeout", // jshint ignore:line
"resource://gre/modules/Timer.jsm");
ChromeUtils.defineModuleGetter(this, "clearTimeout", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "clearTimeout", // jshint ignore:line
"resource://gre/modules/Timer.jsm");
ChromeUtils.defineModuleGetter(this, "PromiseUtils", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "PromiseUtils", // jshint ignore:line
"resource://gre/modules/PromiseUtils.jsm");
// Default maximum duration of swipe

12
accessible/jsat/OutputGenerator.jsm
View File

@@ -17,16 +17,16 @@ const IGNORE_EXPLICIT_NAME = 0x20;
const OUTPUT_DESC_FIRST = 0;
const OUTPUT_DESC_LAST = 1;
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Utils", // jshint ignore:line
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Utils", // jshint ignore:line
"resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "PrefCache", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "PrefCache", // jshint ignore:line
"resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "Logger", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "Logger", // jshint ignore:line
"resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "Roles", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "Roles", // jshint ignore:line
"resource://gre/modules/accessibility/Constants.jsm");
ChromeUtils.defineModuleGetter(this, "States", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "States", // jshint ignore:line
"resource://gre/modules/accessibility/Constants.jsm");
this.EXPORTED_SYMBOLS = ["UtteranceGenerator", "BrailleGenerator"]; // jshint ignore:line

10
accessible/jsat/PointerAdapter.jsm
View File

@@ -11,15 +11,15 @@ const Cu = Components.utils;
this.EXPORTED_SYMBOLS = ["PointerRelay", "PointerAdapter"]; // jshint ignore:line
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Utils", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "Utils", // jshint ignore:line
"resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "Logger", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "Logger", // jshint ignore:line
"resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "GestureSettings", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "GestureSettings", // jshint ignore:line
"resource://gre/modules/accessibility/Gestures.jsm");
ChromeUtils.defineModuleGetter(this, "GestureTracker", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "GestureTracker", // jshint ignore:line
"resource://gre/modules/accessibility/Gestures.jsm");
// The virtual touch ID generated by a mouse event.

16
accessible/jsat/Presentation.jsm
View File

@@ -8,19 +8,19 @@
const {utils: Cu, interfaces: Ci} = Components;
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "Logger", // jshint ignore:line
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/accessibility/Utils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Logger", // jshint ignore:line
"resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "PivotContext", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "PivotContext", // jshint ignore:line
"resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "UtteranceGenerator", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "UtteranceGenerator", // jshint ignore:line
"resource://gre/modules/accessibility/OutputGenerator.jsm");
ChromeUtils.defineModuleGetter(this, "BrailleGenerator", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "BrailleGenerator", // jshint ignore:line
"resource://gre/modules/accessibility/OutputGenerator.jsm");
ChromeUtils.defineModuleGetter(this, "Roles", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "Roles", // jshint ignore:line
"resource://gre/modules/accessibility/Constants.jsm");
ChromeUtils.defineModuleGetter(this, "States", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "States", // jshint ignore:line
"resource://gre/modules/accessibility/Constants.jsm");
this.EXPORTED_SYMBOLS = ["Presentation"]; // jshint ignore:line

12
accessible/jsat/Traversal.jsm
View File

@@ -11,15 +11,15 @@ const Cu = Components.utils;
this.EXPORTED_SYMBOLS = ["TraversalRules", "TraversalHelper"]; // jshint ignore:line
ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Roles", // jshint ignore:line
Cu.import("resource://gre/modules/accessibility/Utils.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Roles", // jshint ignore:line
"resource://gre/modules/accessibility/Constants.jsm");
ChromeUtils.defineModuleGetter(this, "Filters", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "Filters", // jshint ignore:line
"resource://gre/modules/accessibility/Constants.jsm");
ChromeUtils.defineModuleGetter(this, "States", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "States", // jshint ignore:line
"resource://gre/modules/accessibility/Constants.jsm");
ChromeUtils.defineModuleGetter(this, "Prefilters", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "Prefilters", // jshint ignore:line
"resource://gre/modules/accessibility/Constants.jsm");
var gSkipEmptyImages = new PrefCache("accessibility.accessfu.skip_empty_images");

16
accessible/jsat/Utils.jsm
View File

@@ -8,20 +8,20 @@
const {classes: Cc, utils: Cu, interfaces: Ci} = Components;
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Services", // jshint ignore:line
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Services", // jshint ignore:line
"resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "Rect", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "Rect", // jshint ignore:line
"resource://gre/modules/Geometry.jsm");
ChromeUtils.defineModuleGetter(this, "Roles", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "Roles", // jshint ignore:line
"resource://gre/modules/accessibility/Constants.jsm");
ChromeUtils.defineModuleGetter(this, "Events", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "Events", // jshint ignore:line
"resource://gre/modules/accessibility/Constants.jsm");
ChromeUtils.defineModuleGetter(this, "Relations", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "Relations", // jshint ignore:line
"resource://gre/modules/accessibility/Constants.jsm");
ChromeUtils.defineModuleGetter(this, "States", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "States", // jshint ignore:line
"resource://gre/modules/accessibility/Constants.jsm");
ChromeUtils.defineModuleGetter(this, "PluralForm", // jshint ignore:line
XPCOMUtils.defineLazyModuleGetter(this, "PluralForm", // jshint ignore:line
"resource://gre/modules/PluralForm.jsm");
this.EXPORTED_SYMBOLS = ["Utils", "Logger", "PivotContext", "PrefCache"]; // jshint ignore:line

16
accessible/jsat/content-script.js
View File

@@ -7,20 +7,20 @@
var Ci = Components.interfaces;
var Cu = Components.utils;
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Logger",
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Logger",
"resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "Presentation",
XPCOMUtils.defineLazyModuleGetter(this, "Presentation",
"resource://gre/modules/accessibility/Presentation.jsm");
ChromeUtils.defineModuleGetter(this, "Utils",
XPCOMUtils.defineLazyModuleGetter(this, "Utils",
"resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "EventManager",
XPCOMUtils.defineLazyModuleGetter(this, "EventManager",
"resource://gre/modules/accessibility/EventManager.jsm");
ChromeUtils.defineModuleGetter(this, "ContentControl",
XPCOMUtils.defineLazyModuleGetter(this, "ContentControl",
"resource://gre/modules/accessibility/ContentControl.jsm");
ChromeUtils.defineModuleGetter(this, "Roles",
XPCOMUtils.defineLazyModuleGetter(this, "Roles",
"resource://gre/modules/accessibility/Constants.jsm");
ChromeUtils.defineModuleGetter(this, "States",
XPCOMUtils.defineLazyModuleGetter(this, "States",
"resource://gre/modules/accessibility/Constants.jsm");
Logger.info("content-script.js", content.document.location);

2
accessible/tests/mochitest/browser.js
View File

@@ -89,7 +89,7 @@ function reloadButton() {
// //////////////////////////////////////////////////////////////////////////////
// private section
ChromeUtils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
var gBrowserContext =
{

2
accessible/tests/mochitest/common.js
View File

@@ -91,7 +91,7 @@ const MAX_TRIM_LENGTH = 100;
/**
* Services to determine if e10s is enabled.
*/
ChromeUtils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
/**
* nsIAccessibilityService service.

2
accessible/tests/mochitest/events.js
View File

@@ -40,7 +40,7 @@ const kFromUserInput = 1;
// //////////////////////////////////////////////////////////////////////////////
// General
ChromeUtils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
/**
* Set up this variable to dump events into DOM.

2
accessible/tests/mochitest/events/docload/test_docload_root.html
View File

@@ -17,7 +17,7 @@
<script type="application/javascript">
// Front end stuff sometimes likes to stuff things in the hidden window(s)
// in which case there's accessibles for that content.
ChromeUtils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
// Force the creation of an accessible for the hidden window's document.
let doc = Services.appShell.hiddenDOMWindow.document;

2
accessible/tests/mochitest/events/docload/test_docload_shutdown.html
View File

@@ -17,7 +17,7 @@
<script type="application/javascript">
// Front end stuff sometimes likes to stuff things in the hidden window(s)
// in which case there's accessibles for that content.
ChromeUtils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
// Force the creation of an accessible for the hidden window's document.
let doc = Services.appShell.hiddenDOMWindow.document;

2
accessible/tests/mochitest/events/test_textattrchange.html
View File

@@ -27,7 +27,7 @@
const nsIDOMNSEditableElement =
Components.interfaces.nsIDOMNSEditableElement;
ChromeUtils.import("resource://gre/modules/InlineSpellChecker.jsm");
Components.utils.import("resource://gre/modules/InlineSpellChecker.jsm");
function spelledTextInvoker(aID) {
this.DOMNode = getNode(aID);

2
accessible/tests/mochitest/jsat/dom_helper.js
View File

@@ -5,7 +5,7 @@
var Ci = Components.interfaces;
var Cu = Components.utils;
ChromeUtils.import("resource://gre/modules/Geometry.jsm");
Cu.import("resource://gre/modules/Geometry.jsm");
var win = getMainChromeWindow(window);

10
accessible/tests/mochitest/jsat/jsatcommon.js
View File

@@ -14,10 +14,10 @@ var gTestFuncs = [];
*/
var gIterator;
ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.import("resource://gre/modules/accessibility/EventManager.jsm");
ChromeUtils.import("resource://gre/modules/accessibility/Gestures.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/accessibility/Utils.jsm");
Components.utils.import("resource://gre/modules/accessibility/EventManager.jsm");
Components.utils.import("resource://gre/modules/accessibility/Gestures.jsm");
var AccessFuTest = {
@@ -139,7 +139,7 @@ var AccessFuTest = {
})();
// Start AccessFu and put it in stand-by.
ChromeUtils.import("resource://gre/modules/accessibility/AccessFu.jsm");
Components.utils.import("resource://gre/modules/accessibility/AccessFu.jsm");
AccessFu.attach(getMainChromeWindow(window));

4
accessible/tests/mochitest/jsat/output.js
View File

@@ -1,8 +1,8 @@
var Cu = Components.utils;
const PREF_UTTERANCE_ORDER = "accessibility.accessfu.utterance";
ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
ChromeUtils.import("resource://gre/modules/accessibility/OutputGenerator.jsm", this);
Cu.import("resource://gre/modules/accessibility/Utils.jsm");
Cu.import("resource://gre/modules/accessibility/OutputGenerator.jsm", this);
/**
* Test context output generation.

2
accessible/tests/mochitest/jsat/test_pointer_relay.html
View File

@@ -13,7 +13,7 @@
<script type="application/javascript" src="./dom_helper.js"></script>
<script type="application/javascript">
ChromeUtils.import(
Components.utils.import(
"resource://gre/modules/accessibility/PointerAdapter.jsm");
var tests = [

2
accessible/tests/mochitest/jsat/test_traversal.html
View File

@@ -21,7 +21,7 @@
<script type="application/javascript" src="../layout.js"></script>
<script type="application/javascript">
ChromeUtils.import("resource://gre/modules/accessibility/Traversal.jsm");
Components.utils.import("resource://gre/modules/accessibility/Traversal.jsm");
var gBrowserWnd = null;
var gQueue = null;

2
accessible/tests/mochitest/jsat/test_traversal_helper.html
View File

@@ -21,7 +21,7 @@
<script type="application/javascript" src="../layout.js"></script>
<script type="application/javascript">
ChromeUtils.import("resource://gre/modules/accessibility/Traversal.jsm");
Components.utils.import("resource://gre/modules/accessibility/Traversal.jsm");
var vc;

2
accessible/tests/mochitest/pivot.js
View File

@@ -1,4 +1,4 @@
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
// //////////////////////////////////////////////////////////////////////////////
// Constants

8
browser/base/content/aboutDialog-appUpdater.js
View File

@@ -7,11 +7,11 @@
/* import-globals-from aboutDialog.js */
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/DownloadUtils.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/DownloadUtils.jsm");
ChromeUtils.defineModuleGetter(this, "UpdateUtils",
"resource://gre/modules/UpdateUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(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";

4
browser/base/content/aboutDialog.js
View File

@@ -7,8 +7,8 @@
/* 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");
Components.utils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/AppConstants.jsm");
function init(aEvent) {
if (aEvent.target != document)

2
browser/base/content/browser-addons.js
View File

@@ -608,7 +608,7 @@ var LightWeightThemeWebInstaller = {
get _manager() {
let temp = {};
ChromeUtils.import("resource://gre/modules/LightweightThemeManager.jsm", temp);
Cu.import("resource://gre/modules/LightweightThemeManager.jsm", temp);
delete this._manager;
return this._manager = temp.LightweightThemeManager;
},

2
browser/base/content/browser-ctrlTab.js
View File

@@ -19,7 +19,7 @@ var tabPreviews = {
},
get aspectRatio() {
let { PageThumbUtils } = ChromeUtils.import("resource://gre/modules/PageThumbUtils.jsm", {});
let { PageThumbUtils } = Cu.import("resource://gre/modules/PageThumbUtils.jsm", {});
let [ width, height ] = PageThumbUtils.getThumbnailSize(window);
delete this.aspectRatio;
return this.aspectRatio = height / width;

2
browser/base/content/browser-data-submission-info-bar.js
View File

@@ -21,7 +21,7 @@ var gDataNotificationInfoBar = {
},
get _log() {
let Log = ChromeUtils.import("resource://gre/modules/Log.jsm", {}).Log;
let Log = Cu.import("resource://gre/modules/Log.jsm", {}).Log;
delete this._log;
return this._log = Log.repository.getLoggerWithMessagePrefix(LOGGER_NAME, LOGGER_PREFIX);
},

4
browser/base/content/browser-feeds.js
View File

@@ -3,8 +3,8 @@
* License, v. 2.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.defineModuleGetter(this, "DeferredTask",
"resource://gre/modules/DeferredTask.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "DeferredTask",
"resource://gre/modules/DeferredTask.jsm");
const TYPE_MAYBE_FEED = "application/vnd.mozilla.maybe.feed";
const TYPE_MAYBE_AUDIO_FEED = "application/vnd.mozilla.maybe.audio.feed";

2
browser/base/content/browser-fullScreenAndPointerLock.js
View File

@@ -91,7 +91,7 @@ var PointerlockFsWarning = {
let hostElem = this._element.querySelector(".pointerlockfswarning-domain");
// Document's principal's URI has a host. Display a warning including it.
let utils = {};
ChromeUtils.import("resource://gre/modules/DownloadUtils.jsm", utils);
Cu.import("resource://gre/modules/DownloadUtils.jsm", utils);
hostElem.textContent = utils.DownloadUtils.getURIHost(uri.spec)[0];
}

2
browser/base/content/browser-places.js
View File

@@ -623,7 +623,7 @@ var PlacesCommandHook = {
}
};
ChromeUtils.defineModuleGetter(this, "RecentlyClosedTabsAndWindowsMenuUtils",
XPCOMUtils.defineLazyModuleGetter(this, "RecentlyClosedTabsAndWindowsMenuUtils",
"resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm");
// View for the history menu.

6
browser/base/content/browser-sync.js
View File

@@ -5,11 +5,11 @@
// This file is loaded into the browser window scope.
/* eslint-env mozilla/browser-window */
ChromeUtils.import("resource://services-sync/UIState.jsm");
Cu.import("resource://services-sync/UIState.jsm");
ChromeUtils.defineModuleGetter(this, "EnsureFxAccountsWebChannel",
XPCOMUtils.defineLazyModuleGetter(this, "EnsureFxAccountsWebChannel",
"resource://gre/modules/FxAccountsWebChannel.jsm");
ChromeUtils.defineModuleGetter(this, "Weave",
XPCOMUtils.defineLazyModuleGetter(this, "Weave",
"resource://services-sync/main.js");
const MIN_STATUS_ANIMATION_DURATION = 1600;

30
browser/base/content/browser.js
View File

@@ -10,10 +10,10 @@ var Cu = Components.utils;
var Cc = Components.classes;
var Cr = Components.results;
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/NotificationDB.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/AppConstants.jsm");
Cu.import("resource://gre/modules/NotificationDB.jsm");
const {WebExtensionPolicy} = Cu.getGlobalForObject(Services);
@@ -69,7 +69,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
});
if (AppConstants.MOZ_CRASHREPORTER) {
ChromeUtils.defineModuleGetter(this, "PluginCrashReporter",
XPCOMUtils.defineLazyModuleGetter(this, "PluginCrashReporter",
"resource:///modules/ContentCrashHandlers.jsm");
}
@@ -149,25 +149,25 @@ XPCOMUtils.defineLazyGetter(this, "gTabBrowserBundle", function() {
XPCOMUtils.defineLazyGetter(this, "gCustomizeMode", function() {
let scope = {};
ChromeUtils.import("resource:///modules/CustomizeMode.jsm", scope);
Cu.import("resource:///modules/CustomizeMode.jsm", scope);
return new scope.CustomizeMode(window);
});
XPCOMUtils.defineLazyGetter(this, "InlineSpellCheckerUI", function() {
let tmp = {};
ChromeUtils.import("resource://gre/modules/InlineSpellChecker.jsm", tmp);
Cu.import("resource://gre/modules/InlineSpellChecker.jsm", tmp);
return new tmp.InlineSpellChecker();
});
XPCOMUtils.defineLazyGetter(this, "PageMenuParent", function() {
let tmp = {};
ChromeUtils.import("resource://gre/modules/PageMenu.jsm", tmp);
Cu.import("resource://gre/modules/PageMenu.jsm", tmp);
return new tmp.PageMenuParent();
});
XPCOMUtils.defineLazyGetter(this, "PopupNotifications", function() {
let tmp = {};
ChromeUtils.import("resource://gre/modules/PopupNotifications.jsm", tmp);
Cu.import("resource://gre/modules/PopupNotifications.jsm", tmp);
try {
// Hide all notifications while the URL is being edited and the address bar
// has focus, including the virtual focus in the results popup.
@@ -196,7 +196,7 @@ XPCOMUtils.defineLazyGetter(this, "Win7Features", function() {
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", {}).AeroPeek;
let AeroPeek = Cu.import("resource:///modules/WindowsPreviewPerTab.jsm", {}).AeroPeek;
return {
onOpenWindow() {
AeroPeek.onOpenWindow(window);
@@ -273,7 +273,7 @@ Object.defineProperty(this, "AddonManager", {
enumerable: true,
get() {
let tmp = {};
ChromeUtils.import("resource://gre/modules/AddonManager.jsm", tmp);
Cu.import("resource://gre/modules/AddonManager.jsm", tmp);
return this.AddonManager = tmp.AddonManager;
},
set(val) {
@@ -1313,7 +1313,7 @@ var gBrowserInit = {
if (window.matchMedia("(-moz-os-version: windows-win8)").matches &&
window.matchMedia("(-moz-windows-default-theme)").matches) {
let windowFrameColor = new Color(...ChromeUtils.import("resource:///modules/Windows8WindowFrameColor.jsm", {})
let windowFrameColor = new Color(...Cu.import("resource:///modules/Windows8WindowFrameColor.jsm", {})
.Windows8WindowFrameColor.get());
// Default to black for foreground text.
if (!windowFrameColor.isContrastRatioAcceptable(new Color(0, 0, 0))) {
@@ -1370,7 +1370,7 @@ var gBrowserInit = {
_delayedStartup() {
let tmp = {};
ChromeUtils.import("resource://gre/modules/TelemetryTimestamps.jsm", tmp);
Cu.import("resource://gre/modules/TelemetryTimestamps.jsm", tmp);
let TelemetryTimestamps = tmp.TelemetryTimestamps;
TelemetryTimestamps.add("delayedStartupStarted");
@@ -1471,7 +1471,7 @@ var gBrowserInit = {
if (!getBoolPref("ui.click_hold_context_menus", false))
SetClickAndHoldHandlers();
ChromeUtils.import("resource:///modules/UpdateTopLevelContentWindowIDHelper.jsm", {})
Cu.import("resource:///modules/UpdateTopLevelContentWindowIDHelper.jsm", {})
.trackBrowserWindow(window);
PlacesToolbarHelper.init();
@@ -1718,7 +1718,7 @@ var gBrowserInit = {
// downloads will start right away, and initializing again won't hurt.
try {
DownloadsCommon.initializeAllDataLinks();
ChromeUtils.import("resource:///modules/DownloadsTaskbar.jsm", {})
Cu.import("resource:///modules/DownloadsTaskbar.jsm", {})
.DownloadsTaskbar.registerIndicator(window);
} catch (ex) {
Cu.reportError(ex);

4
browser/base/content/content.js
View File

@@ -10,8 +10,8 @@
var {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",

16
browser/base/content/newtab/newTab.js
View File

@@ -7,16 +7,16 @@
var Cu = Components.utils;
var Ci = Components.interfaces;
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/PageThumbs.jsm");
ChromeUtils.import("resource://gre/modules/BackgroundPageThumbs.jsm");
ChromeUtils.import("resource:///modules/DirectoryLinksProvider.jsm");
ChromeUtils.import("resource://gre/modules/NewTabUtils.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/PageThumbs.jsm");
Cu.import("resource://gre/modules/BackgroundPageThumbs.jsm");
Cu.import("resource:///modules/DirectoryLinksProvider.jsm");
Cu.import("resource://gre/modules/NewTabUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Rect",
XPCOMUtils.defineLazyModuleGetter(this, "Rect",
"resource://gre/modules/Geometry.jsm");
ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
var {

8
browser/base/content/nsContextMenu.js
View File

@@ -4,10 +4,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("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");
Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
Components.utils.import("resource://gre/modules/BrowserUtils.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
SpellCheckHelper: "resource://gre/modules/InlineSpellChecker.jsm",

4
browser/base/content/pageinfo/pageInfo.js
View File

@@ -2,8 +2,8 @@
* License, v. 2.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/LoadContextInfo.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/LoadContextInfo.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
/* import-globals-from ../../../../toolkit/content/globalOverlay.js */
/* import-globals-from ../../../../toolkit/content/contentAreaUtils.js */

4
browser/base/content/pageinfo/permissions.js
View File

@@ -4,8 +4,8 @@
/* import-globals-from pageInfo.js */
ChromeUtils.import("resource:///modules/SitePermissions.jsm");
ChromeUtils.import("resource://gre/modules/BrowserUtils.jsm");
Components.utils.import("resource:///modules/SitePermissions.jsm");
Components.utils.import("resource://gre/modules/BrowserUtils.jsm");
var gPermURI;
var gPermPrincipal;

10
browser/base/content/pageinfo/security.js
View File

@@ -3,14 +3,14 @@
* License, v. 2.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");
Components.utils.import("resource://gre/modules/BrowserUtils.jsm");
/* import-globals-from pageInfo.js */
ChromeUtils.defineModuleGetter(this, "LoginHelper",
"resource://gre/modules/LoginHelper.jsm");
ChromeUtils.defineModuleGetter(this, "PluralForm",
"resource://gre/modules/PluralForm.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "LoginHelper",
"resource://gre/modules/LoginHelper.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",
"resource://gre/modules/PluralForm.jsm");
var security = {
init(uri, windowInfo) {

2
browser/base/content/safeMode.js
View File

@@ -11,7 +11,7 @@ var Cu = Components.utils;
const appStartup = Services.startup;
ChromeUtils.import("resource://gre/modules/ResetProfile.jsm");
Cu.import("resource://gre/modules/ResetProfile.jsm");
var defaultToReset = false;

6
browser/base/content/sanitize.js
View File

@@ -5,8 +5,8 @@
/* import-globals-from sanitizeDialog.js */
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.jsm",
@@ -285,7 +285,7 @@ Sanitizer.prototype = {
offlineApps: {
async clear(range) {
// AppCache
ChromeUtils.import("resource:///modules/offlineAppCache.jsm");
Components.utils.import("resource:///modules/offlineAppCache.jsm");
// This doesn't wait for the cleanup to be complete.
OfflineAppCacheHelper.clear();

2
browser/base/content/sanitizeDialog.js
View File

@@ -9,7 +9,7 @@ var Cc = Components.classes;
var Ci = Components.interfaces;
var Cu = Components.utils;
var {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm", {});
var {Sanitizer} = Cu.import("resource:///modules/Sanitizer.jsm", {});
Preferences.addAll([
{ id: "privacy.cpd.history", type: "bool" },

22
browser/base/content/tab-content.js
View File

@@ -9,29 +9,29 @@
var {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "E10SUtils",
XPCOMUtils.defineLazyModuleGetter(this, "E10SUtils",
"resource://gre/modules/E10SUtils.jsm");
ChromeUtils.defineModuleGetter(this, "BrowserUtils",
XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils",
"resource://gre/modules/BrowserUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Utils",
XPCOMUtils.defineLazyModuleGetter(this, "Utils",
"resource://gre/modules/sessionstore/Utils.jsm");
ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm");
ChromeUtils.defineModuleGetter(this, "AboutReader",
XPCOMUtils.defineLazyModuleGetter(this, "AboutReader",
"resource://gre/modules/AboutReader.jsm");
ChromeUtils.defineModuleGetter(this, "ReaderMode",
XPCOMUtils.defineLazyModuleGetter(this, "ReaderMode",
"resource://gre/modules/ReaderMode.jsm");
XPCOMUtils.defineLazyGetter(this, "SimpleServiceDiscovery", function() {
let ssdp = ChromeUtils.import("resource://gre/modules/SimpleServiceDiscovery.jsm", {}).SimpleServiceDiscovery;
let ssdp = Cu.import("resource://gre/modules/SimpleServiceDiscovery.jsm", {}).SimpleServiceDiscovery;
// Register targets
ssdp.registerDevice({
id: "roku:ecp",
target: "roku:ecp",
factory(aService) {
ChromeUtils.import("resource://gre/modules/RokuApp.jsm");
Cu.import("resource://gre/modules/RokuApp.jsm");
return new RokuApp(aService);
},
types: ["video/mp4"],
@@ -562,7 +562,7 @@ PageStyleHandler.init();
// 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");
Cu.import("resource:///modules/translation/TranslationContentHandler.jsm");
trHandler = new TranslationContentHandler(global, docShell);
}

2
browser/base/content/test/about/browser_aboutCertError.js
View File

@@ -9,7 +9,7 @@ const GOOD_PAGE = "https://example.com/";
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} = Cu.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
const ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
add_task(async function checkReturnToAboutHome() {

2
browser/base/content/test/about/browser_aboutHome_input.js
View File

@@ -2,7 +2,7 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
ChromeUtils.defineModuleGetter(this, "AppConstants",
XPCOMUtils.defineLazyModuleGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm");
ignoreAllUncaughtExceptions();

2
browser/base/content/test/about/browser_aboutHome_snippets.js
View File

@@ -2,7 +2,7 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
ChromeUtils.defineModuleGetter(this, "AboutHomeUtils",
XPCOMUtils.defineLazyModuleGetter(this, "AboutHomeUtils",
"resource:///modules/AboutHome.jsm");
ignoreAllUncaughtExceptions();

2
browser/base/content/test/about/browser_aboutNetError.js
View File

@@ -8,7 +8,7 @@ Services.prefs.setIntPref("security.tls.version.max", 3);
Services.prefs.setIntPref("security.tls.version.min", 3);
const LOW_TLS_VERSION = "https://tls1.example.com/";
const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
const {TabStateFlusher} = Cu.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
const ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
add_task(async function checkReturnToPreviousPage() {

4
browser/base/content/test/about/browser_aboutSupport.js
View File

@@ -3,8 +3,8 @@
"use strict";
ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/AppConstants.jsm");
Cu.import("resource://gre/modules/Services.jsm");
add_task(async function() {
await BrowserTestUtils.withNewTab({ gBrowser, url: "about:support" }, async function(browser) {

2
browser/base/content/test/about/head.js
View File

@@ -91,7 +91,7 @@ function promiseTabLoadEvent(tab, url) {
function waitForDocLoadAndStopIt(aExpectedURL, aBrowser = gBrowser.selectedBrowser, aStopFromProgressListener = true) {
function content_script(contentStopFromProgressListener) {
let { interfaces: Ci, utils: Cu } = Components;
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
let wp = docShell.QueryInterface(Ci.nsIWebProgress);
function stopContent(now, uri) {

2
browser/base/content/test/alerts/browser_notification_close.js
View File

@@ -1,7 +1,7 @@
"use strict";
const {PlacesTestUtils} =
ChromeUtils.import("resource://testing-common/PlacesTestUtils.jsm", {});
Cu.import("resource://testing-common/PlacesTestUtils.jsm", {});
let notificationURL = "http://example.org/browser/browser/base/content/test/alerts/file_dom_notifications.html";
let oldShowFavicons;

4
browser/base/content/test/captivePortal/head.js
View File

@@ -1,6 +1,6 @@
ChromeUtils.import("resource:///modules/RecentWindow.jsm");
Components.utils.import("resource:///modules/RecentWindow.jsm");
ChromeUtils.defineModuleGetter(this, "CaptivePortalWatcher",
XPCOMUtils.defineLazyModuleGetter(this, "CaptivePortalWatcher",
"resource:///modules/CaptivePortalWatcher.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "cps",

4
browser/base/content/test/chrome/test_aboutCrashed.xul
View File

@@ -15,8 +15,8 @@
const Ci = Components.interfaces;
const Cu = Components.utils;
ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
SimpleTest.waitForExplicitFinish();

8
browser/base/content/test/favicons/browser_favicon_load.js
View File

@@ -18,10 +18,10 @@ const TEST_THIRD_PARTY_PAGE =
const THIRD_PARTY_FAVICON_URI =
TEST_THIRD_PARTY_SITE + "/browser/browser/base/content/test/favicons/file_favicon.png";
ChromeUtils.defineModuleGetter(this, "PromiseUtils",
"resource://gre/modules/PromiseUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesTestUtils",
"resource://testing-common/PlacesTestUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PromiseUtils",
"resource://gre/modules/PromiseUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PlacesTestUtils",
"resource://testing-common/PlacesTestUtils.jsm");
let systemPrincipal = Services.scriptSecurityManager.getSystemPrincipal();

8
browser/base/content/test/favicons/head.js
View File

@@ -1,11 +1,11 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "BrowserTestUtils",
XPCOMUtils.defineLazyModuleGetter(this, "BrowserTestUtils",
"resource://testing-common/BrowserTestUtils.jsm");
ChromeUtils.defineModuleGetter(this, "ContentTask",
XPCOMUtils.defineLazyModuleGetter(this, "ContentTask",
"resource://testing-common/ContentTask.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");

2
browser/base/content/test/forms/head.js
View File

@@ -1,7 +1,7 @@
function hideSelectPopup(selectPopup, mode = "enter", win = window) {
let browser = win.gBrowser.selectedBrowser;
let selectClosedPromise = ContentTask.spawn(browser, null, async function() {
ChromeUtils.import("resource://gre/modules/SelectContentHelper.jsm");
Cu.import("resource://gre/modules/SelectContentHelper.jsm");
return ContentTaskUtils.waitForCondition(() => !SelectContentHelper.open);
});

2
browser/base/content/test/general/browser_PageMetaData_pushstate.js
View File

@@ -6,7 +6,7 @@ add_task(async function() {
let rooturi = "https://example.com/browser/toolkit/modules/tests/browser/";
await BrowserTestUtils.openNewForegroundTab(gBrowser, rooturi + "metadata_simple.html");
await ContentTask.spawn(gBrowser.selectedBrowser, { rooturi }, async function(args) {
ChromeUtils.import("resource://gre/modules/PageMetadata.jsm");
Components.utils.import("resource://gre/modules/PageMetadata.jsm");
let result = PageMetadata.getData(content.document);
// Result should have description.

2
browser/base/content/test/general/browser_blob-channelname.js
View File

@@ -1,6 +1,6 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
Cu.import("resource://gre/modules/NetUtil.jsm");
function test() {
var file = new File([new Blob(["test"], {type: "text/plain"})], "test-name");

4
browser/base/content/test/general/browser_bug409624.js
View File

@@ -2,8 +2,8 @@
* License, v. 2.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.defineModuleGetter(this, "FormHistory",
"resource://gre/modules/FormHistory.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "FormHistory",
"resource://gre/modules/FormHistory.jsm");
add_task(async function test() {
// This test relies on the form history being empty to start with delete

2
browser/base/content/test/general/browser_bug413915.js
View File

@@ -1,4 +1,4 @@
ChromeUtils.defineModuleGetter(this, "Feeds",
XPCOMUtils.defineLazyModuleGetter(this, "Feeds",
"resource:///modules/Feeds.jsm");
function test() {

2
browser/base/content/test/general/browser_bug553455.js
View File

@@ -9,7 +9,7 @@ const XPINSTALL_URL = "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul";
const PREF_INSTALL_REQUIREBUILTINCERTS = "extensions.install.requireBuiltInCerts";
const PROGRESS_NOTIFICATION = "addon-progress";
ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
Cu.import("resource://gre/modules/AppConstants.jsm");
var rootDir = getRootDirectory(gTestPath);
var rootPath = rootDir.split("/");

2
browser/base/content/test/general/browser_bug592338.js
View File

@@ -4,7 +4,7 @@
const TESTROOT = "http://example.com/browser/toolkit/mozapps/extensions/test/xpinstall/";
const {LightweightThemeManager} = ChromeUtils.import("resource://gre/modules/LightweightThemeManager.jsm", {});
const {LightweightThemeManager} = Cu.import("resource://gre/modules/LightweightThemeManager.jsm", {});
/**
* Wait for the given PopupNotification to display

2
browser/base/content/test/general/browser_compacttheme.js
View File

@@ -8,7 +8,7 @@
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} = Components.utils.import("resource://gre/modules/LightweightThemeManager.jsm", {});
registerCleanupFunction(() => {
// Set preferences back to their original values

8
browser/base/content/test/general/browser_contentAltClick.js
View File

@@ -12,10 +12,10 @@
*/
"use strict";
ChromeUtils.defineModuleGetter(this, "Downloads",
"resource://gre/modules/Downloads.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesTestUtils",
"resource://testing-common/PlacesTestUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Downloads",
"resource://gre/modules/Downloads.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PlacesTestUtils",
"resource://testing-common/PlacesTestUtils.jsm");
function setup() {
Services.prefs.setBoolPref("browser.altClickSave", true);

2
browser/base/content/test/general/browser_contentSearchUI.js
View File

@@ -627,7 +627,7 @@ var gDidInitialSetUp = false;
function setUp(aNoEngine) {
return (async function() {
if (!gDidInitialSetUp) {
ChromeUtils.import("resource:///modules/ContentSearch.jsm");
Cu.import("resource:///modules/ContentSearch.jsm");
let originalOnMessageSearch = ContentSearch._onMessageSearch;
let originalOnMessageManageEngines = ContentSearch._onMessageManageEngines;
ContentSearch._onMessageSearch = () => {};

8
browser/base/content/test/general/browser_datachoices_notification.js
View File

@@ -6,9 +6,9 @@
// Pass an empty scope object to the import to prevent "leaked window property"
// errors in tests.
var Preferences = ChromeUtils.import("resource://gre/modules/Preferences.jsm", {}).Preferences;
var Preferences = Cu.import("resource://gre/modules/Preferences.jsm", {}).Preferences;
var TelemetryReportingPolicy =
ChromeUtils.import("resource://gre/modules/TelemetryReportingPolicy.jsm", {}).TelemetryReportingPolicy;
Cu.import("resource://gre/modules/TelemetryReportingPolicy.jsm", {}).TelemetryReportingPolicy;
const PREF_BRANCH = "datareporting.policy.";
const PREF_BYPASS_NOTIFICATION = PREF_BRANCH + "dataSubmissionPolicyBypassNotification";
@@ -20,14 +20,14 @@ const TEST_POLICY_VERSION = 37;
function fakeShowPolicyTimeout(set, clear) {
let reportingPolicy =
ChromeUtils.import("resource://gre/modules/TelemetryReportingPolicy.jsm", {}).Policy;
Cu.import("resource://gre/modules/TelemetryReportingPolicy.jsm", {}).Policy;
reportingPolicy.setShowInfobarTimeout = set;
reportingPolicy.clearShowInfobarTimeout = clear;
}
function sendSessionRestoredNotification() {
let reportingPolicyImpl =
ChromeUtils.import("resource://gre/modules/TelemetryReportingPolicy.jsm", {}).TelemetryReportingPolicyImpl;
Cu.import("resource://gre/modules/TelemetryReportingPolicy.jsm", {}).TelemetryReportingPolicyImpl;
reportingPolicyImpl.observe(null, "sessionstore-windows-restored", null);
}

4
browser/base/content/test/general/browser_fullscreen-window-open.js
View File

@@ -1,6 +1,6 @@
/* eslint-disable mozilla/no-arbitrary-setTimeout */
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
var Cc = Components.classes;
var Ci = Components.interfaces;

4
browser/base/content/test/general/browser_newWindowDrop.js
View File

@@ -17,7 +17,7 @@ add_task(async function test_setup() {
Services.search.currentEngine = 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} = Cu.import("resource:///modules/CustomizableUI.jsm", {});
let origPlacement = CustomizableUI.getPlacementOfWidget("new-window-button");
if (!origPlacement || origPlacement.area != CustomizableUI.AREA_NAVBAR) {
CustomizableUI.addWidgetToArea("new-window-button",
@@ -83,7 +83,7 @@ async function drop(dragData, expectedWindowOpenCount = 0) {
ok(newWindowButton, "New Window button exists");
let tmp = {};
ChromeUtils.import("resource://testing-common/TestUtils.jsm", tmp);
Cu.import("resource://testing-common/TestUtils.jsm", tmp);
let awaitDrop = BrowserTestUtils.waitForEvent(newWindowButton, "drop");
let actualWindowOpenCount = 0;

2
browser/base/content/test/general/browser_offlineQuotaNotification.js
View File

@@ -15,7 +15,7 @@ registerCleanupFunction(function() {
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:///modules/offlineAppCache.jsm", {});
let {OfflineAppCacheHelper} = Components.utils.import("resource:///modules/offlineAppCache.jsm", {});
OfflineAppCacheHelper.clear();
});

4
browser/base/content/test/general/browser_remoteTroubleshoot.js
View File

@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var {WebChannel} = ChromeUtils.import("resource://gre/modules/WebChannel.jsm", {});
var {WebChannel} = Cu.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);
@@ -64,7 +64,7 @@ add_task(async function() {
let updateChannel = null;
try {
updateChannel = ChromeUtils.import("resource://gre/modules/UpdateUtils.jsm", {}).UpdateUtils.UpdateChannel;
updateChannel = Cu.import("resource://gre/modules/UpdateUtils.jsm", {}).UpdateUtils.UpdateChannel;
} catch (ex) {}
if (!updateChannel) {
Assert.ok(!("updateChannel" in got.message.application),

6
browser/base/content/test/general/browser_remoteWebNavigation_postdata.js
View File

@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/BrowserUtils.jsm");
Cu.import("resource://gre/modules/BrowserUtils.jsm");
function makeInputStream(aString) {
let stream = Cc["@mozilla.org/io/string-input-stream;1"]
@@ -13,8 +13,8 @@ function makeInputStream(aString) {
add_task(async function test_remoteWebNavigation_postdata() {
let obj = {};
ChromeUtils.import("resource://testing-common/httpd.js", obj);
ChromeUtils.import("resource://services-common/utils.js", obj);
Cu.import("resource://testing-common/httpd.js", obj);
Cu.import("resource://services-common/utils.js", obj);
let server = new obj.HttpServer();
server.start(-1);

2
browser/base/content/test/general/browser_restore_isAppTab.js
View File

@@ -3,7 +3,7 @@
/* eslint-env mozilla/frame-script */
const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
const {TabStateFlusher} = Cu.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
const DUMMY = "http://example.com/browser/browser/base/content/test/general/dummy_page.html";

8
browser/base/content/test/general/browser_sanitize-timespans.js
View File

@@ -1,5 +1,5 @@
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
requestLongerTimeout(2);
@@ -14,8 +14,8 @@ var tempScope = {};
Services.scriptloader.loadSubScript("chrome://browser/content/sanitize.js", tempScope);
var Sanitizer = tempScope.Sanitizer;
var FormHistory = (ChromeUtils.import("resource://gre/modules/FormHistory.jsm", {})).FormHistory;
var Downloads = (ChromeUtils.import("resource://gre/modules/Downloads.jsm", {})).Downloads;
var FormHistory = (Components.utils.import("resource://gre/modules/FormHistory.jsm", {})).FormHistory;
var Downloads = (Components.utils.import("resource://gre/modules/Downloads.jsm", {})).Downloads;
function promiseFormHistoryRemoved() {
return new Promise(resolve => {

20
browser/base/content/test/general/browser_sanitizeDialog.js
View File

@@ -17,17 +17,17 @@
* browser/base/content/test/general/browser_sanitize-timespans.js.
*/
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
var {LoadContextInfo} = ChromeUtils.import("resource://gre/modules/LoadContextInfo.jsm", {});
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
var {LoadContextInfo} = Cu.import("resource://gre/modules/LoadContextInfo.jsm", {});
ChromeUtils.defineModuleGetter(this, "FormHistory",
"resource://gre/modules/FormHistory.jsm");
ChromeUtils.defineModuleGetter(this, "Downloads",
"resource://gre/modules/Downloads.jsm");
ChromeUtils.defineModuleGetter(this, "Timer",
"resource://gre/modules/Timer.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesTestUtils",
"resource://testing-common/PlacesTestUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "FormHistory",
"resource://gre/modules/FormHistory.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Downloads",
"resource://gre/modules/Downloads.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Timer",
"resource://gre/modules/Timer.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PlacesTestUtils",
"resource://testing-common/PlacesTestUtils.jsm");
var tempScope = {};
Services.scriptloader.loadSubScript("chrome://browser/content/sanitize.js", tempScope);

2
browser/base/content/test/general/browser_save_private_link_perwindowpb.js
View File

@@ -27,7 +27,7 @@ function promiseNoCacheEntry(filename) {
};
function Visitor() {}
let {LoadContextInfo} = ChromeUtils.import("resource://gre/modules/LoadContextInfo.jsm", null);
let {LoadContextInfo} = Cu.import("resource://gre/modules/LoadContextInfo.jsm", null);
let storage = Services.cache2.diskCacheStorage(LoadContextInfo.default, false);
storage.asyncVisitStorage(new Visitor(), true /* Do walk entries */);
});

2
browser/base/content/test/general/browser_tab_detach_restore.js
View File

@@ -1,6 +1,6 @@
"use strict";
const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
const {TabStateFlusher} = Cu.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
add_task(async function() {
let uri = "http://example.com/browser/browser/base/content/test/general/dummy_page.html";

2
browser/base/content/test/general/browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js
View File

@@ -5,7 +5,7 @@
const OPEN_LOCATION_PREF = "browser.link.open_newwindow";
const NON_REMOTE_PAGE = "about:welcomeback";
ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
Cu.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
requestLongerTimeout(2);

2
browser/base/content/test/general/browser_trackingUI_1.js
View File

@@ -15,7 +15,7 @@ const TRACKING_PAGE = "http://tracking.example.org/browser/browser/base/content/
var TrackingProtection = null;
var tabbrowser = null;
var {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
var {UrlClassifierTestUtils} = Cu.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
registerCleanupFunction(function() {
TrackingProtection = tabbrowser = null;

2
browser/base/content/test/general/browser_trackingUI_2.js
View File

@@ -12,7 +12,7 @@ const TRACKING_PAGE = "http://tracking.example.org/browser/browser/base/content/
var TrackingProtection = null;
var tabbrowser = null;
var {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
var {UrlClassifierTestUtils} = Cu.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
registerCleanupFunction(function() {
TrackingProtection = tabbrowser = null;

2
browser/base/content/test/general/browser_trackingUI_4.js
View File

@@ -12,7 +12,7 @@ const TRACKING_PAGE = "http://tracking.example.org/browser/browser/base/content/
var TrackingProtection = null;
var tabbrowser = null;
var {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
var {UrlClassifierTestUtils} = Cu.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
registerCleanupFunction(function() {
TrackingProtection = tabbrowser = null;

2
browser/base/content/test/general/browser_trackingUI_5.js
View File

@@ -8,7 +8,7 @@ const PB_PREF = "privacy.trackingprotection.pbmode.enabled";
const TRACKING_PAGE = "http://tracking.example.org/browser/browser/base/content/test/general/trackingPage.html";
var TrackingProtection = null;
var browser = null;
var {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
var {UrlClassifierTestUtils} = Cu.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
registerCleanupFunction(function() {
TrackingProtection = browser = null;

2
browser/base/content/test/general/browser_trackingUI_telemetry.js
View File

@@ -6,7 +6,7 @@ var {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
const PREF = "privacy.trackingprotection.enabled";
const BENIGN_PAGE = "http://tracking.example.org/browser/browser/base/content/test/general/benignPage.html";
const TRACKING_PAGE = "http://tracking.example.org/browser/browser/base/content/test/general/trackingPage.html";
const {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
const {UrlClassifierTestUtils} = Cu.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
/**
* Enable local telemetry recording for the duration of the tests.

4
browser/base/content/test/general/browser_web_channel.js
View File

@@ -2,8 +2,8 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "WebChannel",
Cu.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "WebChannel",
"resource://gre/modules/WebChannel.jsm");
const HTTP_PATH = "http://example.com";

4
browser/base/content/test/general/contextmenu_common.js
View File

@@ -290,8 +290,8 @@ async function test_contextmenu(selector, menuItems, options = {}) {
info("Waiting for spell check");
await ContentTask.spawn(gBrowser.selectedBrowser, selector, async function(contentSelector) {
let {onSpellCheck} =
ChromeUtils.import("resource://testing-common/AsyncSpellCheckTestHelper.jsm",
{});
Cu.import("resource://testing-common/AsyncSpellCheckTestHelper.jsm",
{});
let element = content.document.querySelector(contentSelector);
await new Promise(resolve => onSpellCheck(element, resolve));
info("Spell check running");

8
browser/base/content/test/general/head.js
View File

@@ -1,10 +1,10 @@
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesTestUtils",
XPCOMUtils.defineLazyModuleGetter(this, "PlacesTestUtils",
"resource://testing-common/PlacesTestUtils.jsm");
ChromeUtils.defineModuleGetter(this, "TabCrashHandler",
XPCOMUtils.defineLazyModuleGetter(this, "TabCrashHandler",
"resource:///modules/ContentCrashHandlers.jsm");
/**

6
browser/base/content/test/metaTags/head.js
View File

@@ -1,8 +1,8 @@
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesTestUtils",
XPCOMUtils.defineLazyModuleGetter(this, "PlacesTestUtils",
"resource://testing-common/PlacesTestUtils.jsm");
/**

6
browser/base/content/test/newtab/head.js
View File

@@ -16,9 +16,9 @@ const initialTab = gBrowser.selectedTab;
gBrowser.removeTab(initialTab);
var tmp = {};
ChromeUtils.import("resource://gre/modules/NewTabUtils.jsm", tmp);
ChromeUtils.import("resource:///modules/DirectoryLinksProvider.jsm", tmp);
ChromeUtils.import("resource://testing-common/PlacesTestUtils.jsm", tmp);
Cu.import("resource://gre/modules/NewTabUtils.jsm", tmp);
Cu.import("resource:///modules/DirectoryLinksProvider.jsm", tmp);
Cu.import("resource://testing-common/PlacesTestUtils.jsm", tmp);
Services.scriptloader.loadSubScript("chrome://browser/content/sanitize.js", tmp);
var {NewTabUtils, Sanitizer, DirectoryLinksProvider, PlacesTestUtils} = tmp;

2
browser/base/content/test/performance/browser_startup_content.js
View File

@@ -51,7 +51,7 @@ add_task(async function() {
/* eslint-env mozilla/frame-script */
const {classes: Cc, interfaces: Ci, manager: Cm, utils: Cu} = Components;
Cm.QueryInterface(Ci.nsIServiceManager);
ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
Cu.import("resource://gre/modules/AppConstants.jsm");
let collectStacks = AppConstants.NIGHTLY_BUILD || AppConstants.DEBUG;
let loader = Cc["@mozilla.org/moz/jsloader;1"].getService(Ci.xpcIJSModuleLoader);
let components = {};

4
browser/base/content/test/performance/head.js
View File

@@ -1,8 +1,8 @@
"use strict";
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesTestUtils",
XPCOMUtils.defineLazyModuleGetter(this, "PlacesTestUtils",
"resource://testing-common/PlacesTestUtils.jsm");
/**

2
browser/base/content/test/permissions/browser_temporary_permissions.js
View File

@@ -3,7 +3,7 @@
"use strict";
ChromeUtils.import("resource://gre/modules/E10SUtils.jsm");
Cu.import("resource://gre/modules/E10SUtils.jsm");
const ORIGIN = "https://example.com";
const PERMISSIONS_PAGE = getRootDirectory(gTestPath).replace("chrome://mochitests/content", ORIGIN) + "permissions.html";

2
browser/base/content/test/permissions/browser_temporary_permissions_expiry.js
View File

@@ -8,7 +8,7 @@ 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 } = Cu.import("resource://testing-common/PromiseTestUtils.jsm", {});
PromiseTestUtils.whitelistRejectionsGlobally(/The request is not allowed/);
const EXPIRE_TIME_MS = 100;

2
browser/base/content/test/permissions/head.js
View File

@@ -1,4 +1,4 @@
ChromeUtils.import("resource:///modules/SitePermissions.jsm", this);
Cu.import("resource:///modules/SitePermissions.jsm", this);
function is_hidden(element) {
var style = element.ownerGlobal.getComputedStyle(element);

2
browser/base/content/test/plugins/blocklist_proxy.js
View File

@@ -7,7 +7,7 @@ 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");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
/*
* A lightweight blocklist proxy for the testing purposes.

2
browser/base/content/test/plugins/browser_pluginCrashCommentAndURL.js
View File

@@ -1,5 +1,5 @@
/* global gBrowser */
ChromeUtils.import("resource://gre/modules/CrashSubmit.jsm", this);
Cu.import("resource://gre/modules/CrashSubmit.jsm", this);
const SERVER_URL = "http://example.com/browser/toolkit/crashreporter/test/browser/crashreport.sjs";

2
browser/base/content/test/plugins/browser_pluginCrashReportNonDeterminism.js
View File

@@ -1,7 +1,7 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
Cu.import("resource://gre/modules/PromiseUtils.jsm");
/**
* With e10s, plugins must run in their own process. This means we have

2
browser/base/content/test/plugins/browser_private_clicktoplay.js
View File

@@ -6,7 +6,7 @@ var gTestBrowser = null;
var gNextTest = null;
var gPluginHost = Components.classes["@mozilla.org/plugin/host;1"].getService(Components.interfaces.nsIPluginHost);
ChromeUtils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
var gPrivateWindow = null;
var gPrivateBrowser = null;

6
browser/base/content/test/plugins/head.js
View File

@@ -1,8 +1,8 @@
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PromiseUtils",
XPCOMUtils.defineLazyModuleGetter(this, "PromiseUtils",
"resource://gre/modules/PromiseUtils.jsm");
// Various tests in this directory may define gTestBrowser, to use as the

4
browser/base/content/test/popupNotifications/head.js
View File

@@ -1,6 +1,6 @@
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
/**

4
browser/base/content/test/popups/browser_popup_blocker_identity_block.js
View File

@@ -4,8 +4,8 @@
* License, v. 2.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");
Components.utils.import("resource:///modules/SitePermissions.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
const baseURL = getRootDirectory(gTestPath).replace("chrome://mochitests/content", "http://example.com");
const URL = baseURL + "popup_blocker2.html";

6
browser/base/content/test/referrer/head.js
View File

@@ -1,8 +1,8 @@
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "BrowserTestUtils",
XPCOMUtils.defineLazyModuleGetter(this, "BrowserTestUtils",
"resource://testing-common/BrowserTestUtils.jsm");
ChromeUtils.defineModuleGetter(this, "ContentTask",
XPCOMUtils.defineLazyModuleGetter(this, "ContentTask",
"resource://testing-common/ContentTask.jsm");
const REFERRER_URL_BASE = "/browser/browser/base/content/test/referrer/";

Some files were not shown because too many files have changed in this diff Show More