forked from mirrors/gecko-dev
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
111 lines
3.6 KiB
JavaScript
111 lines
3.6 KiB
JavaScript
var gTestRoot = getRootDirectory(gTestPath).replace("chrome://mochitests/content/", "http://127.0.0.1:8888/");
|
|
var gPluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
|
|
var gTestBrowser = null;
|
|
|
|
// Test clearing plugin data using Sanitizer.jsm.
|
|
const testURL1 = gTestRoot + "browser_clearplugindata.html";
|
|
const testURL2 = gTestRoot + "browser_clearplugindata_noage.html";
|
|
|
|
const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm");
|
|
|
|
const pluginHostIface = Ci.nsIPluginHost;
|
|
var pluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
|
|
pluginHost.QueryInterface(pluginHostIface);
|
|
|
|
var pluginTag = getTestPlugin();
|
|
|
|
function stored(needles) {
|
|
let something = pluginHost.siteHasData(this.pluginTag, null);
|
|
if (!needles)
|
|
return something;
|
|
|
|
if (!something)
|
|
return false;
|
|
|
|
for (let i = 0; i < needles.length; ++i) {
|
|
if (!pluginHost.siteHasData(this.pluginTag, needles[i]))
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
add_task(async function() {
|
|
registerCleanupFunction(function() {
|
|
clearAllPluginPermissions();
|
|
Services.prefs.clearUserPref("plugins.click_to_play");
|
|
Services.prefs.clearUserPref("extensions.blocklist.suppressUI");
|
|
setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
|
|
setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Second Test Plug-in");
|
|
if (gTestBrowser) {
|
|
gBrowser.removeCurrentTab();
|
|
}
|
|
window.focus();
|
|
gTestBrowser = null;
|
|
});
|
|
|
|
Services.prefs.setBoolPref("plugins.click_to_play", true);
|
|
|
|
setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
|
|
setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Second Test Plug-in");
|
|
});
|
|
|
|
function setPrefs(cookies, pluginData) {
|
|
let itemPrefs = Services.prefs.getBranch("privacy.cpd.");
|
|
itemPrefs.setBoolPref("history", false);
|
|
itemPrefs.setBoolPref("downloads", false);
|
|
itemPrefs.setBoolPref("cache", false);
|
|
itemPrefs.setBoolPref("cookies", cookies);
|
|
itemPrefs.setBoolPref("formdata", false);
|
|
itemPrefs.setBoolPref("offlineApps", false);
|
|
itemPrefs.setBoolPref("passwords", false);
|
|
itemPrefs.setBoolPref("sessions", false);
|
|
itemPrefs.setBoolPref("siteSettings", false);
|
|
itemPrefs.setBoolPref("pluginData", pluginData);
|
|
}
|
|
|
|
async function testClearingData(url) {
|
|
// Load page to set data for the plugin.
|
|
gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
|
|
gTestBrowser = gBrowser.selectedBrowser;
|
|
|
|
await promiseTabLoadEvent(gBrowser.selectedTab, url);
|
|
|
|
await promiseUpdatePluginBindings(gTestBrowser);
|
|
|
|
ok(stored(["foo.com", "bar.com", "baz.com", "qux.com"]),
|
|
"Data stored for sites");
|
|
|
|
// Clear 20 seconds ago.
|
|
// In the case of testURL2 the plugin will throw
|
|
// NS_ERROR_PLUGIN_TIME_RANGE_NOT_SUPPORTED, which should result in us
|
|
// clearing all data regardless of age.
|
|
let now_uSec = Date.now() * 1000;
|
|
let range = [now_uSec - 20 * 1000000, now_uSec];
|
|
await Sanitizer.sanitize(null, {range, ignoreTimespan: false});
|
|
|
|
if (url == testURL1) {
|
|
ok(stored(["bar.com", "qux.com"]), "Data stored for sites");
|
|
ok(!stored(["foo.com"]), "Data cleared for foo.com");
|
|
ok(!stored(["baz.com"]), "Data cleared for baz.com");
|
|
|
|
// Clear everything.
|
|
await Sanitizer.sanitize(null, {ignoreTimespan: false});
|
|
}
|
|
|
|
ok(!stored(null), "All data cleared");
|
|
|
|
gBrowser.removeCurrentTab();
|
|
gTestBrowser = null;
|
|
}
|
|
|
|
add_task(async function() {
|
|
// Test when sanitizing cookies.
|
|
await setPrefs(true, false);
|
|
await testClearingData(testURL1);
|
|
await testClearingData(testURL2);
|
|
|
|
// Test when sanitizing pluginData.
|
|
await setPrefs(false, true);
|
|
await testClearingData(testURL1);
|
|
await testClearingData(testURL2);
|
|
});
|