mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 21:28:04 +02:00
e930b89c34
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
71 lines
3.7 KiB
JavaScript
71 lines
3.7 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
"use strict";
|
|
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
do_get_profile();
|
|
|
|
// Test that interrupted sanitizations are properly tracked.
|
|
|
|
add_task(async function() {
|
|
const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm");
|
|
|
|
Services.prefs.setBoolPref(Sanitizer.PREF_NEWTAB_SEGREGATION, false);
|
|
|
|
registerCleanupFunction(() => {
|
|
Services.prefs.clearUserPref(Sanitizer.PREF_SANITIZE_ON_SHUTDOWN);
|
|
Services.prefs.clearUserPref(Sanitizer.PREF_SHUTDOWN_BRANCH + "formdata");
|
|
Services.prefs.clearUserPref(Sanitizer.PREF_NEWTAB_SEGREGATION);
|
|
});
|
|
Services.prefs.setBoolPref(Sanitizer.PREF_SANITIZE_ON_SHUTDOWN, true);
|
|
Services.prefs.setBoolPref(Sanitizer.PREF_SHUTDOWN_BRANCH + "formdata", true);
|
|
|
|
await Sanitizer.onStartup();
|
|
Assert.ok(Sanitizer.shouldSanitizeOnShutdown, "Should sanitize on shutdown");
|
|
|
|
let pendingSanitizations = JSON.parse(
|
|
Services.prefs.getStringPref(Sanitizer.PREF_PENDING_SANITIZATIONS, "[]"));
|
|
Assert.equal(pendingSanitizations.length, 1, "Should have 1 pending sanitization");
|
|
Assert.equal(pendingSanitizations[0].id, "shutdown", "Should be the shutdown sanitization");
|
|
Assert.ok(pendingSanitizations[0].itemsToClear.includes("formdata"), "Pref has been setup");
|
|
Assert.ok(!pendingSanitizations[0].options.isShutdown, "Shutdown option is not present");
|
|
|
|
// Check the preference listeners.
|
|
Services.prefs.setBoolPref(Sanitizer.PREF_SANITIZE_ON_SHUTDOWN, false);
|
|
pendingSanitizations = JSON.parse(
|
|
Services.prefs.getStringPref(Sanitizer.PREF_PENDING_SANITIZATIONS, "[]"));
|
|
Assert.equal(pendingSanitizations.length, 0, "Should not have pending sanitizations");
|
|
Assert.ok(!Sanitizer.shouldSanitizeOnShutdown, "Should not sanitize on shutdown");
|
|
Services.prefs.setBoolPref(Sanitizer.PREF_SANITIZE_ON_SHUTDOWN, true);
|
|
pendingSanitizations = JSON.parse(
|
|
Services.prefs.getStringPref(Sanitizer.PREF_PENDING_SANITIZATIONS, "[]"));
|
|
Assert.equal(pendingSanitizations.length, 1, "Should have 1 pending sanitization");
|
|
Assert.equal(pendingSanitizations[0].id, "shutdown", "Should be the shutdown sanitization");
|
|
|
|
Assert.ok(pendingSanitizations[0].itemsToClear.includes("formdata"),
|
|
"Pending sanitizations should include formdata");
|
|
Services.prefs.setBoolPref(Sanitizer.PREF_SHUTDOWN_BRANCH + "formdata", false);
|
|
pendingSanitizations = JSON.parse(
|
|
Services.prefs.getStringPref(Sanitizer.PREF_PENDING_SANITIZATIONS, "[]"));
|
|
Assert.equal(pendingSanitizations.length, 1, "Should have 1 pending sanitization");
|
|
Assert.ok(!pendingSanitizations[0].itemsToClear.includes("formdata"),
|
|
"Pending sanitizations should have been updated");
|
|
|
|
// Check a sanitization properly rebuilds the pref.
|
|
await Sanitizer.sanitize(["formdata"]);
|
|
pendingSanitizations = JSON.parse(
|
|
Services.prefs.getStringPref(Sanitizer.PREF_PENDING_SANITIZATIONS, "[]"));
|
|
Assert.equal(pendingSanitizations.length, 1, "Should have 1 pending sanitization");
|
|
Assert.equal(pendingSanitizations[0].id, "shutdown", "Should be the shutdown sanitization");
|
|
|
|
// Startup should run the pending one and setup a new shutdown sanitization.
|
|
Services.prefs.setBoolPref(Sanitizer.PREF_SHUTDOWN_BRANCH + "formdata", false);
|
|
await Sanitizer.onStartup();
|
|
pendingSanitizations = JSON.parse(
|
|
Services.prefs.getStringPref(Sanitizer.PREF_PENDING_SANITIZATIONS, "[]"));
|
|
Assert.equal(pendingSanitizations.length, 1, "Should have 1 pending sanitization");
|
|
Assert.equal(pendingSanitizations[0].id, "shutdown", "Should be the shutdown sanitization");
|
|
Assert.ok(!pendingSanitizations[0].itemsToClear.includes("formdata"), "Pref has been setup");
|
|
});
|