Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1478305 - Remove unnecessary ChromeUtils.import calls in testing/. r=mossop

Browse Source 
MozReview-Commit-ID: AGwzWcQ7aWM

--HG--
extra : rebase_source : b575847ac13955f3cab75bb8900b6dae9fd693d5
This commit is contained in:
Mark Banner 2018-07-30 10:40:22 +01:00
parent 43685f06cb
commit e6cf2a84d1
10 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/marionette/test/unit/test_cookie.js
View File

@ -40,8 +40,8 @@ cookie.manager = {
}, },
getCookiesFromHost(host) { getCookiesFromHost(host) {
let hostCookies = this.cookies.filter(cookie => cookie.host === host || let hostCookies = this.cookies.filter(c => c.host === host ||
cookie.host === "." + host); c.host === "." + host);
let nextIndex = 0; let nextIndex = 0;
return { return {

2
testing/modules/AppInfo.jsm
View File

@ -11,8 +11,6 @@ var EXPORTED_SYMBOLS = [
]; ];
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
let origPlatformInfo = Cc["@mozilla.org/xre/app-info;1"] let origPlatformInfo = Cc["@mozilla.org/xre/app-info;1"]
.getService(Ci.nsIPlatformInfo); .getService(Ci.nsIPlatformInfo);

1
testing/modules/Assert.jsm
View File

@ -16,7 +16,6 @@ var EXPORTED_SYMBOLS = [
"Assert" "Assert"
]; ];
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/ObjectUtils.jsm"); ChromeUtils.import("resource://gre/modules/ObjectUtils.jsm");
ChromeUtils.defineModuleGetter(this, "Promise", ChromeUtils.defineModuleGetter(this, "Promise",

1
testing/modules/MockRegistrar.jsm
View File

@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = [
const Cm = Components.manager; const Cm = Components.manager;
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Log.jsm"); ChromeUtils.import("resource://gre/modules/Log.jsm");
var logger = Log.repository.getLogger("MockRegistrar"); var logger = Log.repository.getLogger("MockRegistrar");

2
testing/modules/MockRegistry.jsm
View File

@ -4,7 +4,6 @@
var EXPORTED_SYMBOLS = ["MockRegistry"]; var EXPORTED_SYMBOLS = ["MockRegistry"];
ChromeUtils.import("resource://testing-common/MockRegistrar.jsm"); ChromeUtils.import("resource://testing-common/MockRegistrar.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
class MockRegistry { class MockRegistry {
constructor() { constructor() {
@ -110,4 +109,3 @@ class MockRegistry {
} }
} }
} }

1
testing/modules/TestUtils.jsm
View File

@ -22,7 +22,6 @@ var EXPORTED_SYMBOLS = [
"TestUtils", "TestUtils",
]; ];
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/Timer.jsm"); ChromeUtils.import("resource://gre/modules/Timer.jsm");

3
testing/specialpowers/content/MockColorPicker.jsm
View File

@ -8,9 +8,6 @@ const Cm = Components.manager;
const CONTRACT_ID = "@mozilla.org/colorpicker;1"; const CONTRACT_ID = "@mozilla.org/colorpicker;1";
ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
// Allow stuff from this scope to be accessed from non-privileged scopes. This // Allow stuff from this scope to be accessed from non-privileged scopes. This
// would crash if used outside of automation. // would crash if used outside of automation.
Cu.forcePermissiveCOWs(); Cu.forcePermissiveCOWs();

1
testing/specialpowers/content/MockFilePicker.jsm
View File

@ -10,7 +10,6 @@ const CONTRACT_ID = "@mozilla.org/filepicker;1";
ChromeUtils.import("resource://gre/modules/FileUtils.jsm"); ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
// Allow stuff from this scope to be accessed from non-privileged scopes. This // Allow stuff from this scope to be accessed from non-privileged scopes. This
// would crash if used outside of automation. // would crash if used outside of automation.

2
testing/specialpowers/content/MockPermissionPrompt.jsm
View File

@ -8,9 +8,7 @@ const Cm = Components.manager;
const CONTRACT_ID = "@mozilla.org/content-permission/prompt;1"; const CONTRACT_ID = "@mozilla.org/content-permission/prompt;1";
ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
var registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar); var registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
var oldClassID, oldFactory; var oldClassID, oldFactory;

1
testing/specialpowers/content/SpecialPowersObserver.jsm
View File

@ -13,7 +13,6 @@
var EXPORTED_SYMBOLS = ["SpecialPowersObserver"]; var EXPORTED_SYMBOLS = ["SpecialPowersObserver"];
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.import("resource://gre/modules/Services.jsm");
Cu.importGlobalProperties(["File"]); Cu.importGlobalProperties(["File"]);