Bug 1573176 - Fix SafeBrowsing doesn't use correct preference name for social tracking and cryptoming. r=johannh

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
dlee 2019-08-13 07:51:50 +00:00
Родитель 5da36f02d4
Коммит 56a1409a1d
2 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -5261,8 +5261,8 @@ pref("urlclassifier.features.cryptomining.annotate.blacklistTables", "base-crypt
pref("urlclassifier.features.cryptomining.annotate.whitelistTables", "mozstd-trackwhite-digest256");
pref("urlclassifier.features.socialtracking.blacklistTables", "social-tracking-protection-digest256,social-tracking-protection-facebook-digest256,social-tracking-protection-linkedin-digest256,social-tracking-protection-twitter-digest256");
pref("urlclassifier.features.socialtracking.whitelistTables", "mozstd-trackwhite-digest256");
pref("urlclassifier.features.socialtracking.annotation.blacklistTables", "social-tracking-protection-digest256,social-tracking-protection-facebook-digest256,social-tracking-protection-linkedin-digest256,social-tracking-protection-twitter-digest256");
pref("urlclassifier.features.socialtracking.annotation.whitelistTables", "mozstd-trackwhite-digest256");
pref("urlclassifier.features.socialtracking.annotate.blacklistTables", "social-tracking-protection-digest256,social-tracking-protection-facebook-digest256,social-tracking-protection-linkedin-digest256,social-tracking-protection-twitter-digest256");
pref("urlclassifier.features.socialtracking.annotate.whitelistTables", "mozstd-trackwhite-digest256");
// These tables will never trigger a gethash call.
pref("urlclassifier.disallow_completions", "goog-downloadwhite-digest256,base-track-digest256,mozstd-trackwhite-digest256,content-track-digest256,mozplugin-block-digest256,mozplugin2-block-digest256,block-flash-digest256,except-flash-digest256,allow-flashallow-digest256,except-flashallow-digest256,block-flashsubdoc-digest256,except-flashsubdoc-digest256,goog-passwordwhite-proto,ads-track-digest256,social-track-digest256,analytics-track-digest256,base-fingerprinting-track-digest256,content-fingerprinting-track-digest256,base-cryptomining-track-digest256,content-cryptomining-track-digest256,fanboyannoyance-ads-digest256,fanboysocial-ads-digest256,easylist-ads-digest256,easyprivacy-ads-digest256,adguard-ads-digest256,social-tracking-protection-digest256,social-tracking-protection-facebook-digest256,social-tracking-protection-linkedin-digest256,social-tracking-protection-twitter-digest256");

Просмотреть файл

@ -174,6 +174,7 @@ const FEATURES = [
"urlclassifier.features.fingerprinting.annotate.whitelistTables",
],
enabled() {
// Annotation features are enabled by default.
return true;
},
update() {
@ -209,10 +210,8 @@ const FEATURES = [
"urlclassifier.features.cryptomining.annotate.whitelistTables",
],
enabled() {
return Services.prefs.getBoolPref(
"privacy.trackingprotection.annotate.cryptomining.enabled",
false
);
// Annotation features are enabled by default.
return true;
},
update() {
return Services.prefs.getBoolPref(
@ -247,6 +246,7 @@ const FEATURES = [
"urlclassifier.features.socialtracking.annotate.whitelistTables",
],
enabled() {
// Annotation features are enabled by default.
return true;
},
update() {