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

Bug 1822010 - Convert toolkit/components/url-classifier to ES modules. r=perftest-reviewers,webcompat-reviewers,geckoview-reviewers,devtools-reviewers,twisniewski,valentin,m_kato,anti-tracking-reviewers,timhuang,sparky

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D173390
This commit is contained in:
Pushpanjali
2023-05-18 12:21:12 +00:00
parent 2b8a8c6e59
commit e60b51b744
42 changed files with 88 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
toolkit/components/url-classifier/tests/UrlClassifierTestUtils.jsm → toolkit/components/url-classifier/tests/UrlClassifierTestUtils.sys.mjs
View File

@@ -1,7 +1,3 @@
"use strict";
var EXPORTED_SYMBOLS = ["UrlClassifierTestUtils"];
const ANNOTATION_TABLE_NAME = "mochitest1-track-simple";
const ANNOTATION_TABLE_PREF = "urlclassifier.trackingAnnotationTable";
const ANNOTATION_ENTITYLIST_TABLE_NAME = "mochitest1-trackwhite-simple";
@@ -25,7 +21,7 @@ const EMAIL_TRACKING_TABLE_PREF =
let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
var UrlClassifierTestUtils = {
export var UrlClassifierTestUtils = {
addTestTrackers() {
// Add some URLs to the tracking databases
let annotationURL1 = "tracking.example.org/"; // only for annotations

4
toolkit/components/url-classifier/tests/browser/browser_emailtracking_telemetry.js
View File

@@ -5,8 +5,8 @@
"use strict";
let { UrlClassifierTestUtils } = ChromeUtils.import(
"resource://testing-common/UrlClassifierTestUtils.jsm"
let { UrlClassifierTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/UrlClassifierTestUtils.sys.mjs"
);
const TEST_DOMAIN = "https://example.com/";

2
toolkit/components/url-classifier/tests/moz.build
View File

@@ -10,7 +10,7 @@ XPCSHELL_TESTS_MANIFESTS += ["unit/xpcshell.ini"]
BROWSER_CHROME_MANIFESTS += ["browser/browser.ini"]
TESTING_JS_MODULES += [
"UrlClassifierTestUtils.jsm",
"UrlClassifierTestUtils.sys.mjs",
]
if CONFIG["ENABLE_TESTS"]:

4
toolkit/components/url-classifier/tests/unit/test_bug1274685_unowned_list.js
View File

@@ -1,5 +1,5 @@
const { SafeBrowsing } = ChromeUtils.import(
"resource://gre/modules/SafeBrowsing.jsm"
const { SafeBrowsing } = ChromeUtils.importESModule(
"resource://gre/modules/SafeBrowsing.sys.mjs"
);
const { updateAppInfo } = ChromeUtils.importESModule(
"resource://testing-common/AppInfo.sys.mjs"

4
toolkit/components/url-classifier/tests/unit/test_channelClassifierService.js
View File

@@ -9,8 +9,8 @@
var httpserver = new HttpServer();
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
const { UrlClassifierTestUtils } = ChromeUtils.import(
"resource://testing-common/UrlClassifierTestUtils.jsm"
const { UrlClassifierTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/UrlClassifierTestUtils.sys.mjs"
);
const FEATURE_STP_PREF = "privacy.trackingprotection.socialtracking.enabled";

4
toolkit/components/url-classifier/tests/unit/test_rsListService.js
View File

@@ -9,8 +9,8 @@
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { SBRS_UPDATE_MINIMUM_DELAY } = ChromeUtils.import(
"resource://gre/modules/UrlClassifierRemoteSettingsService.jsm"
const { SBRS_UPDATE_MINIMUM_DELAY } = ChromeUtils.importESModule(
"resource://gre/modules/UrlClassifierRemoteSettingsService.sys.mjs"
);
const COLLECTION_NAME = "tracking-protection-lists";

4
toolkit/components/url-classifier/tests/unit/test_shouldclassify.js
View File

@@ -5,8 +5,8 @@
"use strict";
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
const { UrlClassifierTestUtils } = ChromeUtils.import(
"resource://testing-common/UrlClassifierTestUtils.jsm"
const { UrlClassifierTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/UrlClassifierTestUtils.sys.mjs"
);
const defaultTopWindowURI = NetUtil.newURI("http://www.example.com/");