From b25f1991c8aa410f95b4fe26fde6e653e21b8efd Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 1 Jun 2018 16:52:16 +0200 Subject: Partially revert safebrowsing commits to fix "tracking protection". This resolves #425. --- browser/components/preferences/blocklists.js | 2 -- browser/components/preferences/jar.mn | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'browser') diff --git a/browser/components/preferences/blocklists.js b/browser/components/preferences/blocklists.js index c0ce5b656..bc39eb6bd 100644 --- a/browser/components/preferences/blocklists.js +++ b/browser/components/preferences/blocklists.js @@ -6,11 +6,9 @@ Components.utils.import("resource://gre/modules/Services.jsm"); const BASE_LIST_ID = "base"; const CONTENT_LIST_ID = "content"; const TRACK_SUFFIX = "-track-digest256"; -#ifdef MOZ_SAFE_BROWSING const TRACKING_TABLE_PREF = "urlclassifier.trackingTable"; const LISTS_PREF_BRANCH = "browser.safebrowsing.provider.mozilla.lists."; const UPDATE_TIME_PREF = "browser.safebrowsing.provider.mozilla.nextupdatetime"; -#endif var gBlocklistManager = { _type: "", diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn index f83809b03..c0d34da7f 100644 --- a/browser/components/preferences/jar.mn +++ b/browser/components/preferences/jar.mn @@ -6,7 +6,7 @@ browser.jar: content/browser/preferences/applicationManager.xul content/browser/preferences/applicationManager.js content/browser/preferences/blocklists.xul -* content/browser/preferences/blocklists.js + content/browser/preferences/blocklists.js * content/browser/preferences/colors.xul * content/browser/preferences/cookies.xul content/browser/preferences/cookies.js -- cgit v1.2.3