mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1434374 - Auto-rewrite Cu.import into ChromeUtils.import or require calls. r=jdescottes 

MozReview-Commit-ID: 7YyLu5q23Hs

--HG--
extra : rebase_source : bb2805652c85d74a3e888326f4afa4b6857afa64
This commit is contained in:
Alexandre Poirot 2018-02-07 01:37:36 -08:00
Родитель 30e8a847a0
Коммит e563788ea7
257 изменённых файлов: 341 добавлений и 341 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
devtools/client/aboutdebugging/test/browser_addons_debug_bootstrapped.js
Просмотреть файл

@ -8,7 +8,7 @@ requestLongerTimeout(2);
const ADDON_ID = "test-devtools@mozilla.org";
const ADDON_NAME = "test-devtools";
const { BrowserToolboxProcess } = Cu.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
const { BrowserToolboxProcess } = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
add_task(function* () {
yield new Promise(resolve => {

2
devtools/client/aboutdebugging/test/browser_addons_debug_webextension.js
Просмотреть файл

@ -12,7 +12,7 @@ const ADDON_MANIFEST_PATH = "addons/test-devtools-webextension/manifest.json";
const {
BrowserToolboxProcess
} = Cu.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:

2
devtools/client/aboutdebugging/test/browser_addons_debug_webextension_inspector.js
Просмотреть файл

@ -11,7 +11,7 @@ const ADDON_PATH = "addons/test-devtools-webextension/manifest.json";
const {
BrowserToolboxProcess
} = Cu.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:

2
devtools/client/aboutdebugging/test/browser_addons_debug_webextension_nobg.js
Просмотреть файл

@ -11,7 +11,7 @@ const ADDON_NOBG_PATH = "addons/test-devtools-webextension-nobg/manifest.json";
const {
BrowserToolboxProcess
} = Cu.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:

2
devtools/client/aboutdebugging/test/browser_addons_debug_webextension_popup.js
Просмотреть файл

@ -11,7 +11,7 @@ const ADDON_MANIFEST_PATH = "addons/test-devtools-webextension/manifest.json";
const {
BrowserToolboxProcess
} = Cu.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:

4
devtools/client/aboutdebugging/test/head.js
Просмотреть файл

@ -12,8 +12,8 @@ Services.scriptloader.loadSubScript(
"chrome://mochitests/content/browser/devtools/client/framework/test/shared-head.js",
this);
const { AddonManager } = Cu.import("resource://gre/modules/AddonManager.jsm", {});
const { Management } = Cu.import("resource://gre/modules/Extension.jsm", {});
const { AddonManager } = ChromeUtils.import("resource://gre/modules/AddonManager.jsm", {});
const { Management } = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
flags.testing = true;
registerCleanupFunction(() => {

2
devtools/client/aboutdebugging/test/xpcshell-head.js
Просмотреть файл

@ -5,4 +5,4 @@
/* eslint no-unused-vars: [2, {"vars": "local"}] */
const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});

2
devtools/client/animationinspector/animation-controller.js
Просмотреть файл

@ -12,7 +12,7 @@
"use strict";
var { loader, require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
var { loader, require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
var { Task } = require("devtools/shared/task");
loader.lazyRequireGetter(this, "promise");

2
devtools/client/animationinspector/test/unit/test_findOptimalTimeInterval.js
Просмотреть файл

@ -6,7 +6,7 @@
"use strict";
const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
const {findOptimalTimeInterval} = require("devtools/client/animationinspector/utils");
// This test array contains objects that are used to test the

2
devtools/client/animationinspector/test/unit/test_formatStopwatchTime.js
Просмотреть файл

@ -5,7 +5,7 @@
"use strict";
const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
const {formatStopwatchTime} = require("devtools/client/animationinspector/utils");
const TEST_DATA = [{

2
devtools/client/animationinspector/test/unit/test_getCssPropertyName.js
Просмотреть файл

@ -5,7 +5,7 @@
"use strict";
const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
const {getCssPropertyName} = require("devtools/client/animationinspector/utils");
const TEST_DATA = [{

2
devtools/client/animationinspector/test/unit/test_timeScale.js
Просмотреть файл

@ -5,7 +5,7 @@
"use strict";
const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
const {TimeScale} = require("devtools/client/animationinspector/utils");
const TEST_ANIMATIONS = [{
desc: "Testing a few standard animations",

2
devtools/client/animationinspector/test/unit/test_timeScale_dimensions.js
Просмотреть файл

@ -5,7 +5,7 @@
"use strict";
const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
const {TimeScale} = require("devtools/client/animationinspector/utils");
const TEST_ENDDELAY_X = [{

2
devtools/client/canvasdebugger/canvasdebugger.js
Просмотреть файл

@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const { require } = Cu.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 promise = require("promise");

2
devtools/client/canvasdebugger/test/head.js
Просмотреть файл

@ -3,7 +3,7 @@
"use strict";
var { generateUUID } = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);
var { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
var Services = require("Services");
var promise = require("promise");

2
devtools/client/commandline/test/browser_cmd_highlight_02.js
Просмотреть файл

@ -35,7 +35,7 @@ function test() {
function getHighlighterNumber() {
return ContentTask.spawn(gBrowser.selectedBrowser, {}, function* () {
const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
return require("devtools/shared/gcli/commands/highlight").highlighters.length;
});
}

2
devtools/client/commandline/test/browser_cmd_screenshot.js
Просмотреть файл

@ -10,7 +10,7 @@
const TEST_URI = "http://example.com/browser/devtools/client/commandline/" +
"test/browser_cmd_screenshot.html";
var FileUtils = (Cu.import("resource://gre/modules/FileUtils.jsm", {})).FileUtils;
var FileUtils = (ChromeUtils.import("resource://gre/modules/FileUtils.jsm", {})).FileUtils;
function test() {
// This test gets bombarded by a cascade of GCs and often takes 50s so lets be

2
devtools/client/commandline/test/head.js
Просмотреть файл

@ -10,7 +10,7 @@
const TEST_BASE_HTTP = "http://example.com/browser/devtools/client/commandline/test/";
const TEST_BASE_HTTPS = "https://example.com/browser/devtools/client/commandline/test/";
var { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
var { console } = require("resource://gre/modules/Console.jsm");
var flags = require("devtools/shared/flags");

2
devtools/client/commandline/test/helpers.js
Просмотреть файл

@ -22,7 +22,7 @@ var { helpers, assert } = (function () {
var helpers = {};
var { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
var { TargetFactory } = require("devtools/client/framework/target");
var { gDevToolsBrowser } = require("devtools/client/framework/devtools-browser");
var Services = require("Services");

2
devtools/client/debugger/debugger-controller.js
Просмотреть файл

@ -94,7 +94,7 @@ const FRAME_TYPE = {
PUBLIC_CLIENT_EVAL: 3
};
const { BrowserLoader } = Cu.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/",
window,

2
devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-create.js
Просмотреть файл

@ -7,7 +7,7 @@
* Tests that a chrome debugger can be created in a new process.
*/
const { BrowserToolboxProcess } = Cu.import(
const { BrowserToolboxProcess } = ChromeUtils.import(
"resource://devtools/client/framework/ToolboxProcess.jsm",
{}
);

2
devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-debugging.js
Просмотреть файл

@ -11,7 +11,7 @@ var gClient, gThreadClient;
var gNewGlobal = promise.defer();
var gNewChromeSource = promise.defer();
var { DevToolsLoader } = Cu.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");

4
devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/bootstrap.js поставляемый
Просмотреть файл

@ -9,13 +9,13 @@ function notify() {
}
function startup(aParams, aReason) {
const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
let res = Services.io.getProtocolHandler("resource")
.QueryInterface(Ci.nsIResProtocolHandler);
res.setSubstitution("browser_dbg_addon4", aParams.resourceURI);
// Load a JS module
Cu.import("resource://browser_dbg_addon4/test.jsm"); // eslint-disable-line mozilla/no-single-arg-cu-import
ChromeUtils.import("resource://browser_dbg_addon4/test.jsm"); // eslint-disable-line mozilla/no-single-arg-cu-import
// Log objects so makeDebuggeeValue can get the global to use
console.log({ msg: "Hello from the test add-on" });

2
devtools/client/debugger/test/mochitest/browser_dbg_addon-modules-unpacked.js
Просмотреть файл

@ -36,7 +36,7 @@ function test() {
is(sources[2].label, "testxul.js", "correct label for addon tab code");
// Load a new module and tab and check they appear in the list of sources
Cu.import("resource://browser_dbg_addon5/test2.jsm", {});
ChromeUtils.import("resource://browser_dbg_addon5/test2.jsm", {});
let tab2 = yield addTab("chrome://browser_dbg_addon5/content/test2.xul");
groups = yield addonDebugger.getSourceGroups();

2
devtools/client/debugger/test/mochitest/browser_dbg_addon-modules.js
Просмотреть файл

@ -35,7 +35,7 @@ function test() {
is(sources[2].label, "testxul.js", "correct label for addon tab code");
// Load a new module and tab and check they appear in the list of sources
Cu.import("resource://browser_dbg_addon4/test2.jsm", {});
ChromeUtils.import("resource://browser_dbg_addon4/test2.jsm", {});
let tab2 = yield addTab("chrome://browser_dbg_addon4/content/test2.xul");
groups = yield addonDebugger.getSourceGroups();

2
devtools/client/debugger/test/mochitest/browser_dbg_chrome-debugging.js
Просмотреть файл

@ -14,7 +14,7 @@ var gAttached = promise.defer();
var gNewGlobal = promise.defer();
var gNewChromeSource = promise.defer();
var { DevToolsLoader } = Cu.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");

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-01.js
Просмотреть файл

@ -8,7 +8,7 @@
*/
function test() {
let { Parser } = Cu.import("resource://devtools/shared/Parser.jsm", {});
let { Parser } = ChromeUtils.import("resource://devtools/shared/Parser.jsm", {});
let source = "let x = 42;";
let parser = new Parser();

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-02.js
Просмотреть файл

@ -8,7 +8,7 @@
*/
function test() {
let { Parser } = Cu.import("resource://devtools/shared/Parser.jsm", {});
let { Parser } = ChromeUtils.import("resource://devtools/shared/Parser.jsm", {});
let source = "let x + 42;";
let parser = new Parser();

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-03.js
Просмотреть файл

@ -8,7 +8,7 @@
*/
function test() {
let { Parser } = Cu.import("resource://devtools/shared/Parser.jsm", {});
let { Parser } = ChromeUtils.import("resource://devtools/shared/Parser.jsm", {});
let source = [
"<!doctype html>",

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-04.js
Просмотреть файл

@ -8,7 +8,7 @@
*/
function test() {
let { Parser } = Cu.import("resource://devtools/shared/Parser.jsm", {});
let { Parser } = ChromeUtils.import("resource://devtools/shared/Parser.jsm", {});
let source = [
"<!doctype html>",

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-05.js
Просмотреть файл

@ -9,7 +9,7 @@
*/
function test() {
let { Parser } = Cu.import("resource://devtools/shared/Parser.jsm", {});
let { Parser } = ChromeUtils.import("resource://devtools/shared/Parser.jsm", {});
let source = [
"let a = [];",

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-06.js
Просмотреть файл

@ -10,7 +10,7 @@
function test() {
let { Parser, ParserHelpers, SyntaxTreeVisitor } =
Cu.import("resource://devtools/shared/Parser.jsm", {});
ChromeUtils.import("resource://devtools/shared/Parser.jsm", {});
function verify(source, predicate, [sline, scol], [eline, ecol]) {
let ast = Parser.reflectionAPI.parse(source);

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-07.js
Просмотреть файл

@ -9,7 +9,7 @@
*/
function test() {
let { ParserHelpers } = Cu.import("resource://devtools/shared/Parser.jsm", {});
let { ParserHelpers } = ChromeUtils.import("resource://devtools/shared/Parser.jsm", {});
let node1 = { loc: {
start: { line: 1, column: 10 },

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-08.js
Просмотреть файл

@ -9,7 +9,7 @@
function test() {
let { Parser, ParserHelpers, SyntaxTreeVisitor } =
Cu.import("resource://devtools/shared/Parser.jsm", {});
ChromeUtils.import("resource://devtools/shared/Parser.jsm", {});
function verify(source, predicate, details) {
let { name, chain } = details;

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-09.js
Просмотреть файл

@ -10,7 +10,7 @@
function test() {
let { Parser, ParserHelpers, SyntaxTreeVisitor } =
Cu.import("resource://devtools/shared/Parser.jsm", {});
ChromeUtils.import("resource://devtools/shared/Parser.jsm", {});
function verify(source, predicate, details) {
let { name, chain } = details;

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-10.js
Просмотреть файл

@ -9,7 +9,7 @@
function test() {
let { Parser, ParserHelpers, SyntaxTreeVisitor } =
Cu.import("resource://devtools/shared/Parser.jsm", {});
ChromeUtils.import("resource://devtools/shared/Parser.jsm", {});
function verify(source, predicate, string) {
let ast = Parser.reflectionAPI.parse(source);

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-11.js
Просмотреть файл

@ -8,7 +8,7 @@
*/
function test() {
let { Parser } = Cu.import("resource://devtools/shared/Parser.jsm", {});
let { Parser } = ChromeUtils.import("resource://devtools/shared/Parser.jsm", {});
let source = [
'<script type="text/javascript" src="chrome://foo.js"/>',

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-computed-name.js
Просмотреть файл

@ -11,7 +11,7 @@
function test() {
let { Parser, SyntaxTreeVisitor } =
Cu.import("resource://devtools/shared/Parser.jsm", {});
ChromeUtils.import("resource://devtools/shared/Parser.jsm", {});
let ast = Parser.reflectionAPI.parse("({ [i]: 1 })");
let nodes = SyntaxTreeVisitor.filter(ast, e => e.type == "ComputedName");

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-function-defaults.js
Просмотреть файл

@ -11,7 +11,7 @@
function test() {
let { Parser, ParserHelpers, SyntaxTreeVisitor } =
Cu.import("resource://devtools/shared/Parser.jsm", {});
ChromeUtils.import("resource://devtools/shared/Parser.jsm", {});
function verify(source, predicate, string) {
let ast = Parser.reflectionAPI.parse(source);

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-spread-expression.js
Просмотреть файл

@ -11,7 +11,7 @@
function test() {
let { Parser, SyntaxTreeVisitor } =
Cu.import("resource://devtools/shared/Parser.jsm", {});
ChromeUtils.import("resource://devtools/shared/Parser.jsm", {});
const SCRIPTS = ["[...a]", "foo(...a)"];

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-template-strings.js
Просмотреть файл

@ -11,7 +11,7 @@
function test() {
let { Parser, SyntaxTreeVisitor } =
Cu.import("resource://devtools/shared/Parser.jsm", {});
ChromeUtils.import("resource://devtools/shared/Parser.jsm", {});
let ast = Parser.reflectionAPI.parse("`foo${i}bar`");
let nodes = SyntaxTreeVisitor.filter(ast, e => e.type == "TemplateLiteral");

2
devtools/client/debugger/test/mochitest/browser_dbg_promises-rejection-stack.js
Просмотреть файл

@ -16,7 +16,7 @@ var EventEmitter = require("devtools/shared/event-emitter");
// The code in the document above leaves an uncaught rejection. This is only
// reported to the testing framework if the code is loaded in the main process.
if (!gMultiProcessBrowser) {
Cu.import("resource://testing-common/PromiseTestUtils.jsm", this);
ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
PromiseTestUtils.expectUncaughtRejection(/hello/);
}

2
devtools/client/debugger/test/mochitest/browser_dbg_sources-webext-contentscript.js
Просмотреть файл

@ -10,7 +10,7 @@
const ADDON_PATH = "addon-webext-contentscript.xpi";
const TAB_URL = EXAMPLE_URL + "doc_script_webext_contentscript.html";
const {WebExtensionPolicy} = Cu.getGlobalForObject(Cu.import("resource://gre/modules/Extension.jsm", {}));
const {WebExtensionPolicy} = Cu.getGlobalForObject(ChromeUtils.import("resource://gre/modules/Extension.jsm", {}));
function test() {
let gPanel, gDebugger;

2
devtools/client/debugger/test/mochitest/browser_dbg_terminate-on-tab-close.js
Просмотреть файл

@ -10,7 +10,7 @@
// The following rejection should not be left uncaught. This test has been
// whitelisted until the issue is fixed.
if (!gMultiProcessBrowser) {
Cu.import("resource://testing-common/PromiseTestUtils.jsm", this);
ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
PromiseTestUtils.expectUncaughtRejection(/error\.message is undefined/);
}

2
devtools/client/debugger/test/mochitest/browser_dbg_worker-console-04.js
Просмотреть файл

@ -7,7 +7,7 @@
//
// NOTE: Whitelisting a class of rejections should be limited. Normally you
// should use "expectUncaughtRejection" to flag individual failures.
Cu.import("resource://testing-common/PromiseTestUtils.jsm", this);
ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
PromiseTestUtils.whitelistRejectionsGlobally(/[object Object]/);
const TAB_URL = EXAMPLE_URL + "doc_WorkerActor.attachThread-tab.html";

2
devtools/client/debugger/test/mochitest/browser_dbg_worker-window.js
Просмотреть файл

@ -5,7 +5,7 @@
// The following "connectionClosed" rejection should not be left uncaught. This
// test has been whitelisted until the issue is fixed.
Cu.import("resource://testing-common/PromiseTestUtils.jsm", this);
ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
PromiseTestUtils.expectUncaughtRejection(/[object Object]/);
var TAB_URL = EXAMPLE_URL + "doc_WorkerActor.attachThread-tab.html";

4
devtools/client/debugger/test/mochitest/head.js
Просмотреть файл

@ -14,11 +14,11 @@ Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/devtool
var gEnableLogging = Services.prefs.getBoolPref("devtools.debugger.log");
Services.prefs.setBoolPref("devtools.debugger.log", false);
var { BrowserToolboxProcess } = Cu.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
var { BrowserToolboxProcess } = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
var { DebuggerServer } = require("devtools/server/main");
var { DebuggerClient } = require("devtools/shared/client/debugger-client");
var ObjectClient = require("devtools/shared/client/object-client");
var { AddonManager } = Cu.import("resource://gre/modules/AddonManager.jsm", {});
var { AddonManager } = ChromeUtils.import("resource://gre/modules/AddonManager.jsm", {});
var EventEmitter = require("devtools/shared/old-event-emitter");
var { Toolbox } = require("devtools/client/framework/toolbox");

4
devtools/client/dom/main.js
Просмотреть файл

@ -5,8 +5,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const { XPCOMUtils } = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
const { BrowserLoader } = Cu.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({

4
devtools/client/framework/ToolboxProcess.jsm
Просмотреть файл

@ -9,8 +9,8 @@
const DBG_XUL = "chrome://devtools/content/framework/toolbox-process-window.xul";
const CHROME_DEBUGGER_PROFILE_NAME = "chrome_debugger_profile";
const { console } = Cu.import("resource://gre/modules/Console.jsm", {});
const { require, DevToolsLoader } = Cu.import("resource://devtools/shared/Loader.jsm", {});
const { console } = ChromeUtils.import("resource://gre/modules/Console.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");

2
devtools/client/framework/connect/connect.js
Просмотреть файл

@ -6,7 +6,7 @@
"use strict";
var {require} = Cu.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");

4
devtools/client/framework/devtools.js
Просмотреть файл

@ -7,7 +7,7 @@
const {Cu} = require("chrome");
const Services = require("Services");
const {DevToolsShim} = Cu.import("chrome://devtools-shim/content/DevToolsShim.jsm", {});
const {DevToolsShim} = require("chrome://devtools-shim/content/DevToolsShim.jsm");
// Load gDevToolsBrowser toolbox lazily as they need gDevTools to be fully initialized
loader.lazyRequireGetter(this, "TargetFactory", "devtools/client/framework/target", true);
@ -143,7 +143,7 @@ DevTools.prototype = {
toolId = tool;
tool = this._tools.get(tool);
} else {
let {Deprecated} = Cu.import("resource://gre/modules/Deprecated.jsm", {});
let {Deprecated} = require("resource://gre/modules/Deprecated.jsm");
Deprecated.warning("Deprecation WARNING: gDevTools.unregisterTool(tool) is " +
"deprecated. You should unregister a tool using its toolId: " +
"gDevTools.unregisterTool(toolId).");

4
devtools/client/framework/gDevTools.jsm
Просмотреть файл

@ -15,7 +15,7 @@
this.EXPORTED_SYMBOLS = [ "gDevTools", "gDevToolsBrowser" ];
const { loader } = Cu.import("resource://devtools/shared/Loader.jsm", {});
const { loader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
/**
* Do not directly map to the commonjs modules so that callsites of
@ -25,7 +25,7 @@ const { loader } = Cu.import("resource://devtools/shared/Loader.jsm", {});
*/
Object.defineProperty(this, "require", {
get() {
let { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
let { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
return require;
}
});

2
devtools/client/framework/test/browser_browser_toolbox.js
Просмотреть файл

@ -47,7 +47,7 @@ add_task(function* runTest() {
env.set("MOZ_TOOLBOX_TEST_SCRIPT", "");
});
let { BrowserToolboxProcess } = Cu.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
let { BrowserToolboxProcess } = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
let closePromise;
yield new Promise(onRun => {
closePromise = new Promise(onClose => {

10
devtools/client/framework/test/browser_browser_toolbox_debugger.js
Просмотреть файл

@ -84,14 +84,14 @@ add_task(function* runTest() {
const registerCleanupFunction = () => {};
const { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
const { Task } = ChromeUtils.import("resource://gre/modules/Task.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 } = Cu.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);
@ -126,7 +126,7 @@ add_task(function* runTest() {
env.set("MOZ_TOOLBOX_TEST_SCRIPT", "");
});
let { BrowserToolboxProcess } = Cu.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
let { 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;

2
devtools/client/framework/test/browser_target_from_url.js
Просмотреть файл

@ -4,7 +4,7 @@
const TEST_URI = "data:text/html;charset=utf-8," +
"<p>browser_target-from-url.js</p>";
const { DevToolsLoader } = Cu.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);

4
devtools/client/framework/test/shared-head.js
Просмотреть файл

@ -15,7 +15,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr, Constructor: CC}
function scopedCuImport(path) {
const scope = {};
Cu.import(path, scope);
ChromeUtils.import(path, scope);
return scope;
}
@ -696,7 +696,7 @@ function waitForTitleChange(toolbox) {
* @returns {HttpServer}
*/
function createTestHTTPServer() {
const {HttpServer} = Cu.import("resource://testing-common/httpd.js", {});
const {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js", {});
let server = new HttpServer();
registerCleanupFunction(function* cleanup() {

2
devtools/client/framework/toolbox-init.js
Просмотреть файл

@ -13,7 +13,7 @@ let 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 } = Cu.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");

2
devtools/client/framework/toolbox-process-window.js
Просмотреть файл

@ -6,7 +6,7 @@
"use strict";
var { loader, require } = Cu.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");

2
devtools/client/inspector/grids/test/unit/head.js
Просмотреть файл

@ -5,4 +5,4 @@
/* eslint no-unused-vars: [2, {"vars": "local"}] */
const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});

2
devtools/client/inspector/markup/test/browser_markup_links_06.js
Просмотреть файл

@ -9,7 +9,7 @@
// The following rejection should not be left uncaught. This test has been
// whitelisted until the issue is fixed.
Cu.import("resource://testing-common/PromiseTestUtils.jsm", this);
ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
PromiseTestUtils.expectUncaughtRejection(/NS_ERROR_NOT_INITIALIZED/);
const TEST_URL = URL_ROOT + "doc_markup_links.html";

2
devtools/client/inspector/markup/test/browser_markup_mutation_02.js
Просмотреть файл

@ -8,7 +8,7 @@
// corresponding DOM nodes mutate
// Have to use the same timer functions used by the inspector.
const {clearTimeout} = Cu.import("resource://gre/modules/Timer.jsm", {});
const {clearTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm", {});
const TEST_URL = URL_ROOT + "doc_markup_flashing.html";

2
devtools/client/jsonview/converter-child.js
Просмотреть файл

@ -7,7 +7,7 @@
"use strict";
const {Cc, Ci, Cu, CC} = require("chrome");
const { XPCOMUtils } = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
const Services = require("Services");
loader.lazyRequireGetter(this, "NetworkHelper",

6
devtools/client/jsonview/converter-observer.js
Просмотреть файл

@ -8,12 +8,12 @@
const Cm = Components.manager;
const {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
const {Services} = Cu.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 () {
const {devtools} = Cu.import("resource://devtools/shared/Loader.jsm", {});
const {devtools} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
return devtools;
});

2
devtools/client/memory/initializer.js
Просмотреть файл

@ -7,7 +7,7 @@
"use strict";
const BrowserLoaderModule = {};
Cu.import("resource://devtools/client/shared/browser-loader.js", BrowserLoaderModule);
ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", BrowserLoaderModule);
const { require } = BrowserLoaderModule.BrowserLoader({
baseURI: "resource://devtools/client/memory/",
window

2
devtools/client/memory/test/chrome/head.js
Просмотреть файл

@ -3,7 +3,7 @@
"use strict";
var { BrowserLoader } = Cu.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

4
devtools/client/memory/test/unit/head.js
Просмотреть файл

@ -3,8 +3,8 @@
"use strict";
var { console } = Cu.import("resource://gre/modules/Console.jsm", {});
var { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
var { console } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
var Services = require("Services");
var DevToolsUtils = require("devtools/shared/DevToolsUtils");

2
devtools/client/netmonitor/test/browser_net_simple-request-data.js
Просмотреть файл

@ -12,7 +12,7 @@
//
// NOTE: Whitelisting a class of rejections should be limited. Normally you
// should use "expectUncaughtRejection" to flag individual failures.
Cu.import("resource://testing-common/PromiseTestUtils.jsm", this);
ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
PromiseTestUtils.whitelistRejectionsGlobally(/cookies is undefined/);
PromiseTestUtils.whitelistRejectionsGlobally(/requestItem is undefined/);

2
devtools/client/netmonitor/test/unit/test_mdn-utils.js
Просмотреть файл

@ -6,7 +6,7 @@
"use strict";
function run_test() {
const {require} = Cu.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";

4
devtools/client/performance/components/test/head.js
Просмотреть файл

@ -6,9 +6,9 @@
/* global window, document, SimpleTest, requestAnimationFrame, is, ok */
/* exported Cc, Ci, Cu, Cr, Assert, Task, TargetFactory, Toolbox, browserRequire,
forceRender, setProps, dumpn, checkOptimizationHeader, checkOptimizationTree */
let { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
let { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
let { Assert } = require("resource://testing-common/Assert.jsm");
let { BrowserLoader } = Cu.import("resource://devtools/client/shared/browser-loader.js", {});
let { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
let defer = require("devtools/shared/defer");
let flags = require("devtools/shared/flags");
let { Task } = require("devtools/shared/task");

2
devtools/client/performance/performance-controller.js
Просмотреть файл

@ -7,7 +7,7 @@
/* exported Cc, Ci, Cu, Cr, loader, Promise */
var BrowserLoaderModule = {};
Cu.import("resource://devtools/client/shared/browser-loader.js", BrowserLoaderModule);
ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", BrowserLoaderModule);
var { loader, require } = BrowserLoaderModule.BrowserLoader({
baseURI: "resource://devtools/client/performance/",
window

4
devtools/client/performance/test/browser_perf-recordings-io-03.js
Просмотреть файл

@ -7,8 +7,8 @@
* but don't contain the appropriate recording data.
*/
var { FileUtils } = Cu.import("resource://gre/modules/FileUtils.jsm", {});
var { NetUtil } = Cu.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 = Task.async(function* () {
let { target, panel, toolbox } = yield initPerformance(SIMPLE_URL);

2
devtools/client/performance/test/head.js
Просмотреть файл

@ -2,7 +2,7 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const { require, loader } = Cu.import("resource://devtools/shared/Loader.jsm", {});
const { require, loader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
/* exported loader, either, click, dblclick, mousedown, rightMousedown, key */
// All tests are asynchronous.

2
devtools/client/performance/test/unit/head.js
Просмотреть файл

@ -3,7 +3,7 @@
"use strict";
/* exported Cc, Ci, Cu, Cr, Services, console, PLATFORM_DATA_PREF, getFrameNodePath,
synthesizeProfileForTest */
var { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
var Services = require("Services");
var { console } = require("resource://gre/modules/Console.jsm");
const RecordingUtils = require("devtools/shared/performance/recording-utils");

2
devtools/client/responsive.html/index.js
Просмотреть файл

@ -7,7 +7,7 @@
"use strict";
const { BrowserLoader } =
Cu.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

2
devtools/client/responsive.html/test/browser/browser_hide_container.js
Просмотреть файл

@ -9,7 +9,7 @@ const TEST_URL = "http://example.com/";
const CONTAINER_URL = "chrome://devtools/content/responsive.html/index.xhtml";
const { TabStateFlusher } =
Cu.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
const SessionStore =
Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
const { OUTER_FRAME_LOADER_SYMBOL } =

2
devtools/client/responsive.html/test/browser/browser_toolbox_swap_browsers.js
Просмотреть файл

@ -10,7 +10,7 @@ const TEST_URL = "http://example.com/";
function getServerConnections(browser) {
ok(browser.isRemoteBrowser, "Content browser is remote");
return ContentTask.spawn(browser, {}, async function () {
const { require } = Cu.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;

2
devtools/client/responsive.html/test/browser/head.js
Просмотреть файл

@ -278,7 +278,7 @@ function getSessionHistory(browser) {
return ContentTask.spawn(browser, {}, async function () {
/* eslint-disable no-undef */
const { SessionHistory } =
Cu.import("resource://gre/modules/sessionstore/SessionHistory.jsm", {});
ChromeUtils.import("resource://gre/modules/sessionstore/SessionHistory.jsm", {});
return SessionHistory.collect(docShell);
/* eslint-enable no-undef */
});

2
devtools/client/responsive.html/test/unit/head.js
Просмотреть файл

@ -5,7 +5,7 @@
/* eslint no-unused-vars: [2, {"vars": "local"}] */
const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
const promise = require("promise");
const Store = require("devtools/client/responsive.html/store");

2
devtools/client/scratchpad/scratchpad-commands.js
Просмотреть файл

@ -16,7 +16,7 @@ exports.items = [{
tooltipText: l10n.lookup("scratchpadOpenTooltip"),
hidden: true,
exec: function (args, context) {
const {ScratchpadManager} = Cu.import("resource://devtools/client/scratchpad/scratchpad-manager.jsm", {});
const {ScratchpadManager} = require("resource://devtools/client/scratchpad/scratchpad-manager.jsm");
ScratchpadManager.openScratchpad();
}
}];

2
devtools/client/scratchpad/scratchpad-manager.jsm
Просмотреть файл

@ -10,7 +10,7 @@ this.EXPORTED_SYMBOLS = ["ScratchpadManager"];
const SCRATCHPAD_WINDOW_URL = "chrome://devtools/content/scratchpad/scratchpad.xul";
const SCRATCHPAD_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
const {require} = Cu.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");

2
devtools/client/scratchpad/scratchpad.js
Просмотреть файл

@ -39,7 +39,7 @@ const FALLBACK_CHARSET_LIST = "intl.fallbackCharsetList.ISO-8859-1";
const VARIABLES_VIEW_URL = "chrome://devtools/content/shared/widgets/VariablesView.xul";
const {require, loader} = Cu.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;

4
devtools/client/scratchpad/test/browser_scratchpad_confirm_close.js
Просмотреть файл

@ -4,8 +4,8 @@
/* Bug 653427 */
var tempScope = {};
Cu.import("resource://gre/modules/NetUtil.jsm", tempScope);
Cu.import("resource://gre/modules/FileUtils.jsm", tempScope);
ChromeUtils.import("resource://gre/modules/NetUtil.jsm", tempScope);
ChromeUtils.import("resource://gre/modules/FileUtils.jsm", tempScope);
var NetUtil = tempScope.NetUtil;
var FileUtils = tempScope.FileUtils;

2
devtools/client/scratchpad/test/browser_scratchpad_sessions.js
Просмотреть файл

@ -2,7 +2,7 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const {Utils} = Cu.import("resource://gre/modules/sessionstore/Utils.jsm", {});
const {Utils} = ChromeUtils.import("resource://gre/modules/sessionstore/Utils.jsm", {});
const triggeringPrincipal_base64 = Utils.SERIALIZED_SYSTEMPRINCIPAL;
const ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);

2
devtools/client/scratchpad/test/browser_scratchpad_wrong_window_focus.js
Просмотреть файл

@ -29,7 +29,7 @@ function test()
BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser).then(function () {
openScratchpad(function () {
let sw = gScratchpadWindow;
let {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
let {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
let {TargetFactory} = require("devtools/client/framework/target");
openScratchpad(function () {

10
devtools/client/scratchpad/test/head.js
Просмотреть файл

@ -4,11 +4,11 @@
"use strict";
const {NetUtil} = Cu.import("resource://gre/modules/NetUtil.jsm", {});
const {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm", {});
const {console} = Cu.import("resource://gre/modules/Console.jsm", {});
const {ScratchpadManager} = Cu.import("resource://devtools/client/scratchpad/scratchpad-manager.jsm", {});
const {require} = Cu.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 {console} = ChromeUtils.import("resource://gre/modules/Console.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");

2
devtools/client/shadereditor/shadereditor.js
Просмотреть файл

@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const {require} = Cu.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 promise = require("promise");

2
devtools/client/shadereditor/test/head.js
Просмотреть файл

@ -2,7 +2,7 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
var { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
var { Task } = require("devtools/shared/task");
var Services = require("Services");

6
devtools/client/shared/AppCacheUtils.jsm
Просмотреть файл

@ -25,9 +25,9 @@
"use strict";
var { XPCOMUtils } = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
var { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm", {});
var { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
var { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", {});
var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm", {});
var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
var { gDevTools } = require("devtools/client/framework/devtools");
var Services = require("Services");

4
devtools/client/shared/DOMHelpers.jsm
Просмотреть файл

@ -4,8 +4,8 @@
"use strict";
const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
const { require } = Cu.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"];

2
devtools/client/shared/SplitView.jsm
Просмотреть файл

@ -5,7 +5,7 @@
"use strict";
const {require} = Cu.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"];

4
devtools/client/shared/browser-loader.js
Просмотреть файл

@ -3,8 +3,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const loaders = Cu.import("resource://devtools/shared/base-loader.js", {});
const { devtools } = Cu.import("resource://devtools/shared/Loader.jsm", {});
const loaders = ChromeUtils.import("resource://devtools/shared/base-loader.js", {});
const { devtools } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
const { joinURI } = devtools.require("devtools/shared/path");
const { assert } = devtools.require("devtools/shared/DevToolsUtils");
const { AppConstants } = devtools.require("resource://gre/modules/AppConstants.jsm");

4
devtools/client/shared/components/test/mochitest/head.js
Просмотреть файл

@ -5,10 +5,10 @@
"use strict";
var { require } = Cu.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 } = Cu.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");

2
devtools/client/shared/frame-script-utils.js
Просмотреть файл

@ -5,7 +5,7 @@
/* eslint-env browser */
/* global addMessageListener, sendAsyncMessage, content */
"use strict";
const {require, loader} = Cu.import("resource://devtools/shared/Loader.jsm", {});
const {require, loader} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
const { Task } = require("devtools/shared/task");
loader.lazyGetter(this, "nsIProfilerModule", () => {

2
devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.js
Просмотреть файл

@ -48,7 +48,7 @@ add_task(async function () {
const doc = content.document;
const {require} = Cu.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");

2
devtools/client/shared/test/browser_require_raw.js
Просмотреть файл

@ -5,7 +5,7 @@
"use strict";
const { BrowserLoader } = Cu.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/",

2
devtools/client/shared/test/head.js
Просмотреть файл

@ -9,7 +9,7 @@
// shared-head.js handles imports, constants, and utility functions
Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/devtools/client/framework/test/shared-head.js", this);
const {DOMHelpers} = Cu.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/";

2
devtools/client/shared/test/test-actor-registry.js
Просмотреть файл

@ -6,7 +6,7 @@
(function (exports) {
const CC = Components.Constructor;
const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
const { fetch } = require("devtools/shared/DevToolsUtils");
const { Task } = require("devtools/shared/task");

2
devtools/client/shared/test/unit/test_VariablesView_filtering-without-controller.js
Просмотреть файл

@ -11,7 +11,7 @@
const DOMParser = Cc["@mozilla.org/xmlextras/domparser;1"]
.createInstance(Ci.nsIDOMParser);
const { VariablesView } =
Cu.import("resource://devtools/client/shared/widgets/VariablesView.jsm", {});
ChromeUtils.import("resource://devtools/client/shared/widgets/VariablesView.jsm", {});
function run_test() {
let doc = DOMParser.parseFromString("<div>", "text/html");

2
devtools/client/shared/test/unit/test_advanceValidate.js
Просмотреть файл

@ -7,7 +7,7 @@
// Tests the advanceValidate function from rule-view.js.
const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
const {advanceValidate} = require("devtools/client/inspector/shared/utils");
// 1 2 3

2
devtools/client/shared/test/unit/test_bezierCanvas.js
Просмотреть файл

@ -7,7 +7,7 @@
// Tests the BezierCanvas API in the CubicBezierWidget module
var {require} = Cu.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() {

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше