Bug 1539628 - Add skipURLs prefs for all content blocking features; r=baku

Differential Revision: https://phabricator.services.mozilla.com/D26604

--HG--
extra : moz-landing-system : lando

netwerk/url-classifier/UrlClassifierFeatureCryptominingAnnotation.cpp

@@ -27,6 +27,8 @@ namespace {
   "urlclassifier.features.cryptomining.annotate.whitelistTables"
 #define URLCLASSIFIER_CRYPTOMINING_ANNOTATION_WHITELIST_TEST_ENTRIES \
   "urlclassifier.features.cryptomining.annotate.whitelistHosts"
+#define URLCLASSIFIER_CRYPTOMINING_ANNOTATION_SKIP_URLS \
+  "urlclassifier.features.cryptomining.annotate.skipURLs"
 #define TABLE_CRYPTOMINING_ANNOTATION_BLACKLIST_PREF \
   "cryptomining-annotate-blacklist-pref"
 #define TABLE_CRYPTOMINING_ANNOTATION_WHITELIST_PREF \
@@ -49,7 +51,8 @@ UrlClassifierFeatureCryptominingAnnotation::
               URLCLASSIFIER_CRYPTOMINING_ANNOTATION_WHITELIST_TEST_ENTRIES),
           NS_LITERAL_CSTRING(TABLE_CRYPTOMINING_ANNOTATION_BLACKLIST_PREF),
           NS_LITERAL_CSTRING(TABLE_CRYPTOMINING_ANNOTATION_WHITELIST_PREF),
-          EmptyCString()) {}
+          NS_LITERAL_CSTRING(URLCLASSIFIER_CRYPTOMINING_ANNOTATION_SKIP_URLS)) {
+}
 
 /* static */ const char* UrlClassifierFeatureCryptominingAnnotation::Name() {
   return CRYPTOMINING_ANNOTATION_FEATURE_NAME;

netwerk/url-classifier/UrlClassifierFeatureCryptominingProtection.cpp

@@ -27,6 +27,8 @@ namespace {
   "urlclassifier.features.cryptomining.whitelistTables"
 #define URLCLASSIFIER_CRYPTOMINING_WHITELIST_TEST_ENTRIES \
   "urlclassifier.features.cryptomining.whitelistHosts"
+#define URLCLASSIFIER_CRYPTOMINING_SKIP_URLS \
+  "urlclassifier.features.cryptomining.skipURLs"
 #define TABLE_CRYPTOMINING_BLACKLIST_PREF "cryptomining-blacklist-pref"
 #define TABLE_CRYPTOMINING_WHITELIST_PREF "cryptomining-whitelist-pref"
 
@@ -45,7 +47,7 @@ UrlClassifierFeatureCryptominingProtection::
           NS_LITERAL_CSTRING(URLCLASSIFIER_CRYPTOMINING_WHITELIST_TEST_ENTRIES),
           NS_LITERAL_CSTRING(TABLE_CRYPTOMINING_BLACKLIST_PREF),
           NS_LITERAL_CSTRING(TABLE_CRYPTOMINING_WHITELIST_PREF),
-          EmptyCString()) {}
+          NS_LITERAL_CSTRING(URLCLASSIFIER_CRYPTOMINING_SKIP_URLS)) {}
 
 /* static */ const char* UrlClassifierFeatureCryptominingProtection::Name() {
   return CRYPTOMINING_FEATURE_NAME;

netwerk/url-classifier/UrlClassifierFeatureFingerprintingAnnotation.cpp

@@ -27,6 +27,8 @@ namespace {
   "urlclassifier.features.fingerprinting.annotate.whitelistTables"
 #define URLCLASSIFIER_FINGERPRINTING_ANNOTATION_WHITELIST_TEST_ENTRIES \
   "urlclassifier.features.fingerprinting.annotate.whitelistHosts"
+#define URLCLASSIFIER_FINGERPRINTING_ANNOTATION_SKIP_URLS \
+  "urlclassifier.features.fingerprinting.annotate.skipURLs"
 #define TABLE_FINGERPRINTING_ANNOTATION_BLACKLIST_PREF \
   "fingerprinting-annotate-blacklist-pref"
 #define TABLE_FINGERPRINTING_ANNOTATION_WHITELIST_PREF \
@@ -49,7 +51,8 @@ UrlClassifierFeatureFingerprintingAnnotation::
               URLCLASSIFIER_FINGERPRINTING_ANNOTATION_WHITELIST_TEST_ENTRIES),
           NS_LITERAL_CSTRING(TABLE_FINGERPRINTING_ANNOTATION_BLACKLIST_PREF),
           NS_LITERAL_CSTRING(TABLE_FINGERPRINTING_ANNOTATION_WHITELIST_PREF),
-          EmptyCString()) {}
+          NS_LITERAL_CSTRING(
+              URLCLASSIFIER_FINGERPRINTING_ANNOTATION_SKIP_URLS)) {}
 
 /* static */ const char* UrlClassifierFeatureFingerprintingAnnotation::Name() {
   return FINGERPRINTING_ANNOTATION_FEATURE_NAME;

netwerk/url-classifier/UrlClassifierFeatureFingerprintingProtection.cpp

@@ -27,6 +27,8 @@ namespace {
   "urlclassifier.features.fingerprinting.whitelistTables"
 #define URLCLASSIFIER_FINGERPRINTING_WHITELIST_TEST_ENTRIES \
   "urlclassifier.features.fingerprinting.whitelistHosts"
+#define URLCLASSIFIER_FINGERPRINTING_SKIP_URLS \
+  "urlclassifier.features.fingerprinting.skipURLs"
 #define TABLE_FINGERPRINTING_BLACKLIST_PREF "fingerprinting-blacklist-pref"
 #define TABLE_FINGERPRINTING_WHITELIST_PREF "fingerprinting-whitelist-pref"
 
@@ -47,7 +49,7 @@ UrlClassifierFeatureFingerprintingProtection::
               URLCLASSIFIER_FINGERPRINTING_WHITELIST_TEST_ENTRIES),
           NS_LITERAL_CSTRING(TABLE_FINGERPRINTING_BLACKLIST_PREF),
           NS_LITERAL_CSTRING(TABLE_FINGERPRINTING_WHITELIST_PREF),
-          EmptyCString()) {}
+          NS_LITERAL_CSTRING(URLCLASSIFIER_FINGERPRINTING_SKIP_URLS)) {}
 
 /* static */ const char* UrlClassifierFeatureFingerprintingProtection::Name() {
   return FINGERPRINTING_FEATURE_NAME;

netwerk/url-classifier/UrlClassifierFeatureTrackingProtection.cpp

@@ -25,6 +25,8 @@ namespace {
 #define URLCLASSIFIER_TRACKING_WHITELIST "urlclassifier.trackingWhitelistTable"
 #define URLCLASSIFIER_TRACKING_WHITELIST_TEST_ENTRIES \
   "urlclassifier.trackingWhitelistTable.testEntries"
+#define URLCLASSIFIER_TRACKING_PROTECTION_SKIP_URLS \
+  "urlclassifier.trackingSkipURLs"
 #define TABLE_TRACKING_BLACKLIST_PREF "tracking-blacklist-pref"
 #define TABLE_TRACKING_WHITELIST_PREF "tracking-whitelist-pref"
 
@@ -40,7 +42,8 @@ UrlClassifierFeatureTrackingProtection::UrlClassifierFeatureTrackingProtection()
           NS_LITERAL_CSTRING(URLCLASSIFIER_TRACKING_BLACKLIST_TEST_ENTRIES),
           NS_LITERAL_CSTRING(URLCLASSIFIER_TRACKING_WHITELIST_TEST_ENTRIES),
           NS_LITERAL_CSTRING(TABLE_TRACKING_BLACKLIST_PREF),
-          NS_LITERAL_CSTRING(TABLE_TRACKING_WHITELIST_PREF), EmptyCString()) {}
+          NS_LITERAL_CSTRING(TABLE_TRACKING_WHITELIST_PREF),
+          NS_LITERAL_CSTRING(URLCLASSIFIER_TRACKING_PROTECTION_SKIP_URLS)) {}
 
 /* static */ const char* UrlClassifierFeatureTrackingProtection::Name() {
   return TRACKING_PROTECTION_FEATURE_NAME;