From 50ad087351df7de9d92cb5e7b2176d9bde36fcb7 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Thu, 7 Oct 2021 21:38:26 +0000
Subject: [PATCH 1/3] Issue #1721 - Implement GlobalPrivacyControl

(and get rid of failed DoNotTrack)
---
 dom/base/Navigator.cpp                  | 18 +++---------------
 dom/base/Navigator.h                    |  2 +-
 dom/base/nsContentUtils.cpp             | 10 +++++-----
 dom/base/nsContentUtils.h               |  6 +++---
 dom/interfaces/base/nsIDOMNavigator.idl |  1 -
 dom/webidl/Navigator.webidl             |  8 +++++---
 dom/webidl/WorkerNavigator.webidl       |  1 +
 dom/workers/WorkerNavigator.h           |  6 ++++++
 modules/libpref/init/all.js             |  4 ++--
 netwerk/protocol/http/nsHttpAtomList.h  |  2 +-
 netwerk/protocol/http/nsHttpChannel.cpp | 15 +++++----------
 netwerk/protocol/http/nsHttpChannel.h   |  2 +-
 netwerk/protocol/http/nsHttpHandler.cpp | 12 ++++++------
 netwerk/protocol/http/nsHttpHandler.h   |  4 ++--
 14 files changed, 41 insertions(+), 50 deletions(-)

diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
index febe1f1a3a..a636a31ecb 100644
--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
@@ -632,22 +632,10 @@ Navigator::GetBuildID(nsAString& aBuildID)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-Navigator::GetDoNotTrack(nsAString &aResult)
+bool
+Navigator::GlobalPrivacyControl()
 {
-  bool doNotTrack = nsContentUtils::DoNotTrackEnabled();
-  if (!doNotTrack) {
-    nsCOMPtr<nsILoadContext> loadContext = do_GetInterface(mWindow);
-    doNotTrack = loadContext && loadContext->UseTrackingProtection();
-  }
-
-  if (doNotTrack) {
-    aResult.AssignLiteral("1");
-  } else {
-    aResult.AssignLiteral("unspecified");
-  }
-
-  return NS_OK;
+  return nsContentUtils::GPCEnabled();
 }
 
 bool
diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h
index 5738cd2b5a..3a0c9cc45f 100644
--- a/dom/base/Navigator.h
+++ b/dom/base/Navigator.h
@@ -131,7 +131,7 @@ public:
   nsMimeTypeArray* GetMimeTypes(ErrorResult& aRv);
   nsPluginArray* GetPlugins(ErrorResult& aRv);
   Permissions* GetPermissions(ErrorResult& aRv);
-  // The XPCOM GetDoNotTrack is ok
+  bool GlobalPrivacyControl();
   Geolocation* GetGeolocation(ErrorResult& aRv);
 
   static void AppName(nsAString& aAppName, bool aUsePrefOverriddenValue);
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index 69534f9149..29cc1bce47 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -309,7 +309,7 @@ bool nsContentUtils::sFragmentParsingActive = false;
 bool nsContentUtils::sDOMWindowDumpEnabled;
 #endif
 
-bool nsContentUtils::sDoNotTrackEnabled = false;
+bool nsContentUtils::sGPCEnabled = false; 
 
 mozilla::LazyLogModule nsContentUtils::sDOMDumpLog("Dump");
 
@@ -626,8 +626,8 @@ nsContentUtils::Init()
                                "browser.dom.window.dump.enabled");
 #endif
 
-  Preferences::AddBoolVarCache(&sDoNotTrackEnabled,
-                               "privacy.donottrackheader.enabled", false);
+  Preferences::AddBoolVarCache(&sGPCEnabled,
+                               "privacy.GPCheader.enabled", false);
 
   Preferences::AddBoolVarCache(&sUseActivityCursor,
                                "ui.use_activity_cursor", false);
@@ -7337,9 +7337,9 @@ nsContentUtils::DOMWindowDumpEnabled()
 }
 
 bool
-nsContentUtils::DoNotTrackEnabled()
+nsContentUtils::GPCEnabled()
 {
-  return nsContentUtils::sDoNotTrackEnabled;
+  return nsContentUtils::sGPCEnabled;
 }
 
 mozilla::LogModule*
diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h
index a60b102c53..6e9f23054a 100644
--- a/dom/base/nsContentUtils.h
+++ b/dom/base/nsContentUtils.h
@@ -2432,9 +2432,9 @@ public:
   static bool DOMWindowDumpEnabled();
 
   /**
-   * Returns true if the privacy.donottrackheader.enabled pref is set.
+   * Returns true if the privacy.GPCheader.enabled pref is set.
    */
-  static bool DoNotTrackEnabled();
+  static bool GPCEnabled();
 
   /**
    * Returns a LogModule that dump calls from content script are logged to.
@@ -2971,7 +2971,7 @@ private:
 #if !(defined(DEBUG) || defined(MOZ_ENABLE_JS_DUMP))
   static bool sDOMWindowDumpEnabled;
 #endif
-  static bool sDoNotTrackEnabled;
+  static bool sGPCEnabled;
   static mozilla::LazyLogModule sDOMDumpLog;
 };
 
diff --git a/dom/interfaces/base/nsIDOMNavigator.idl b/dom/interfaces/base/nsIDOMNavigator.idl
index 5fd16b8aeb..d4a06c21dc 100644
--- a/dom/interfaces/base/nsIDOMNavigator.idl
+++ b/dom/interfaces/base/nsIDOMNavigator.idl
@@ -22,5 +22,4 @@ interface nsIDOMNavigator : nsISupports
   readonly attribute DOMString             productSub;
   readonly attribute DOMString             userAgent;
   readonly attribute DOMString             buildID;
-  readonly attribute DOMString             doNotTrack;
 };
diff --git a/dom/webidl/Navigator.webidl b/dom/webidl/Navigator.webidl
index 37c853da94..eacb6c9443 100644
--- a/dom/webidl/Navigator.webidl
+++ b/dom/webidl/Navigator.webidl
@@ -30,6 +30,7 @@ Navigator implements NavigatorContentUtils;
 Navigator implements NavigatorStorageUtils;
 Navigator implements NavigatorConcurrentHardware;
 Navigator implements NavigatorStorage;
+Navigator implements NavigatorGlobalPrivacyControl;
 
 [NoInterfaceObject, Exposed=(Window,Worker)]
 interface NavigatorID {
@@ -111,9 +112,10 @@ partial interface Navigator {
   readonly attribute PluginArray plugins;
 };
 
-// http://www.w3.org/TR/tracking-dnt/ sort of
-partial interface Navigator {
-  readonly attribute DOMString doNotTrack;
+// https://globalprivacycontrol.github.io/gpc-spec/
+[NoInterfaceObject, Exposed=(Window,Worker)]
+interface NavigatorGlobalPrivacyControl {
+  readonly attribute boolean globalPrivacyControl;
 };
 
 // http://www.w3.org/TR/geolocation-API/#geolocation_interface
diff --git a/dom/webidl/WorkerNavigator.webidl b/dom/webidl/WorkerNavigator.webidl
index 44d1e29f68..fc3fd603c6 100644
--- a/dom/webidl/WorkerNavigator.webidl
+++ b/dom/webidl/WorkerNavigator.webidl
@@ -12,3 +12,4 @@ WorkerNavigator implements NavigatorLanguage;
 WorkerNavigator implements NavigatorOnLine;
 WorkerNavigator implements NavigatorConcurrentHardware;
 WorkerNavigator implements NavigatorStorage;
+WorkerNavigator implements NavigatorGlobalPrivacyControl;
diff --git a/dom/workers/WorkerNavigator.h b/dom/workers/WorkerNavigator.h
index 5617b7351d..f845ac12f5 100644
--- a/dom/workers/WorkerNavigator.h
+++ b/dom/workers/WorkerNavigator.h
@@ -8,6 +8,7 @@
 
 #include "Workers.h"
 #include "RuntimeService.h"
+#include "nsContentUtils.h"
 #include "nsString.h"
 #include "nsWrapperCache.h"
 #include "mozilla/dom/StorageManager.h"
@@ -100,6 +101,11 @@ public:
     mOnline = aOnline;
   }
 
+  bool GlobalPrivacyControl() const
+  {
+    return nsContentUtils::GPCEnabled();
+  }
+
   void SetLanguages(const nsTArray<nsString>& aLanguages);
 
   uint64_t HardwareConcurrency() const;
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index b7d915996e..9b89ae314c 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1231,8 +1231,8 @@ pref("content.sink.pending_event_mode", 0);
 //   2 = openAbused
 pref("privacy.popups.disable_from_plugins", 2);
 
-// send "do not track" HTTP header, disabled by default
-pref("privacy.donottrackheader.enabled",    false);
+// Send "Sec-GPC" HTTP header, disabled by default
+pref("privacy.GPCheader.enabled",    false);
 // Enforce tracking protection in all modes
 pref("privacy.trackingprotection.enabled",  false);
 // Enforce tracking protection in Private Browsing mode
diff --git a/netwerk/protocol/http/nsHttpAtomList.h b/netwerk/protocol/http/nsHttpAtomList.h
index 2ac6ee7cf3..c8a01f9ccb 100644
--- a/netwerk/protocol/http/nsHttpAtomList.h
+++ b/netwerk/protocol/http/nsHttpAtomList.h
@@ -45,11 +45,11 @@ HTTP_ATOM(Date,                      "Date")
 HTTP_ATOM(DAV,                       "DAV")
 HTTP_ATOM(Depth,                     "Depth")
 HTTP_ATOM(Destination,               "Destination")
-HTTP_ATOM(DoNotTrack,                "DNT")
 HTTP_ATOM(ETag,                      "Etag")
 HTTP_ATOM(Expect,                    "Expect")
 HTTP_ATOM(Expires,                   "Expires")
 HTTP_ATOM(From,                      "From")
+HTTP_ATOM(GlobalPrivacyControl,      "Sec-GPC")
 HTTP_ATOM(Host,                      "Host")
 HTTP_ATOM(If,                        "If")
 HTTP_ATOM(If_Match,                  "If-Match")
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index a3a5c6530c..1bf57a0d3b 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -5711,7 +5711,7 @@ nsHttpChannel::BeginConnect()
     mRequestHead.SetOrigin(scheme, host, port);
 
     SetOriginHeader();
-    SetDoNotTrack();
+    SetGPC();
 
     NeckoOriginAttributes originAttributes;
     NS_GetOriginAttributes(this, originAttributes);
@@ -8051,18 +8051,13 @@ nsHttpChannel::SetOriginHeader()
 }
 
 void
-nsHttpChannel::SetDoNotTrack()
+nsHttpChannel::SetGPC()
 {
   /**
-   * 'DoNotTrack' header should be added if 'privacy.donottrackheader.enabled'
-   * is true or tracking protection is enabled. See bug 1258033.
+   * 'Sec-GPC: 1' header should be added if 'privacy.GPCheader.enabled' is true.
    */
-  nsCOMPtr<nsILoadContext> loadContext;
-  NS_QueryNotificationCallbacks(this, loadContext);
-
-  if ((loadContext && loadContext->UseTrackingProtection()) ||
-      nsContentUtils::DoNotTrackEnabled()) {
-    mRequestHead.SetHeader(nsHttp::DoNotTrack,
+  if (nsContentUtils::GPCEnabled()) {
+    mRequestHead.SetHeader(nsHttp::GlobalPrivacyControl,
                            NS_LITERAL_CSTRING("1"),
                            false);
   }
diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
index 62cf0e470b..2681f34764 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
@@ -453,7 +453,7 @@ private:
     void SetPushedStream(Http2PushedStreamWrapper *stream);
 
     void SetOriginHeader();
-    void SetDoNotTrack();
+    void SetGPC();
 
 private:
     nsCOMPtr<nsICancelable>           mProxyRequest;
diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index a1ba6d3634..a4e481fcac 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -87,7 +87,7 @@
 #define HTTP_PREF_PREFIX        "network.http."
 #define INTL_ACCEPT_LANGUAGES   "intl.accept_languages"
 #define BROWSER_PREF_PREFIX     "browser.cache."
-#define DONOTTRACK_HEADER_ENABLED "privacy.donottrackheader.enabled"
+#define GPC_HEADER_ENABLED      "privacy.GPCheader.enabled"
 #define H2MANDATORY_SUITE        "security.ssl3.ecdhe_rsa_aes_128_gcm_sha256"
 #define ALLOW_EXPERIMENTS        "network.allow-experiments"
 #define SAFE_HINT_HEADER_VALUE   "safeHint.enabled"
@@ -181,7 +181,7 @@ nsHttpHandler::nsHttpHandler()
     , mAcceptLanguagesIsDirty(true)
     , mPromptTempRedirect(true)
     , mEnablePersistentHttpsCaching(false)
-    , mDoNotTrackEnabled(false)
+    , mGPCEnabled(false)
     , mSafeHintEnabled(false)
     , mParentalControlEnabled(false)
     , mHandlerActive(false)
@@ -279,7 +279,7 @@ nsHttpHandler::Init()
         prefBranch->AddObserver(UA_PREF_PREFIX, this, true);
         prefBranch->AddObserver(INTL_ACCEPT_LANGUAGES, this, true);
         prefBranch->AddObserver(BROWSER_PREF("disk_cache_ssl"), this, true);
-        prefBranch->AddObserver(DONOTTRACK_HEADER_ENABLED, this, true);
+        prefBranch->AddObserver(GPC_HEADER_ENABLED, this, true);
         prefBranch->AddObserver(H2MANDATORY_SUITE, this, true);
         prefBranch->AddObserver(HTTP_PREF("tcp_keepalive.short_lived_connections"), this, true);
         prefBranch->AddObserver(HTTP_PREF("tcp_keepalive.long_lived_connections"), this, true);
@@ -1497,11 +1497,11 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
     // Tracking options
     //
 
-    if (PREF_CHANGED(DONOTTRACK_HEADER_ENABLED)) {
+    if (PREF_CHANGED(GPC_HEADER_ENABLED)) {
         cVar = false;
-        rv = prefs->GetBoolPref(DONOTTRACK_HEADER_ENABLED, &cVar);
+        rv = prefs->GetBoolPref(GPC_HEADER_ENABLED, &cVar);
         if (NS_SUCCEEDED(rv)) {
-            mDoNotTrackEnabled = cVar;
+            mGPCEnabled = cVar;
         }
     }
     // Hint option
diff --git a/netwerk/protocol/http/nsHttpHandler.h b/netwerk/protocol/http/nsHttpHandler.h
index c3f6290095..caeabf81de 100644
--- a/netwerk/protocol/http/nsHttpHandler.h
+++ b/netwerk/protocol/http/nsHttpHandler.h
@@ -515,8 +515,8 @@ private:
     // Persistent HTTPS caching flag
     bool           mEnablePersistentHttpsCaching;
 
-    // For broadcasting tracking preference
-    bool           mDoNotTrackEnabled;
+    // For broadcasting Global Privacy Control preference
+    bool           mGPCEnabled;
 
     // for broadcasting safe hint;
     bool           mSafeHintEnabled;

From 591a887bf3b30ed366fa6738e02acdc5ce491d98 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Thu, 7 Oct 2021 23:20:53 +0000
Subject: [PATCH 2/3] [Pale-Moon] Issue MoonchildProductions/UXP#1721 -
 Implement GlobalPrivacyControl

Front-end and locale changes for GPC in preferences as well as migration.
Also bumps the back-end pointer to pick up the platform changes necessary.
---
 .../palemoon/components/nsBrowserGlue.js      | 10 ++++++-
 .../components/preferences/privacy.xul        | 26 +++++++++----------
 .../chrome/browser/preferences/privacy.dtd    |  8 +++---
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/application/palemoon/components/nsBrowserGlue.js b/application/palemoon/components/nsBrowserGlue.js
index 055fb40575..958475a29e 100644
--- a/application/palemoon/components/nsBrowserGlue.js
+++ b/application/palemoon/components/nsBrowserGlue.js
@@ -1284,7 +1284,7 @@ BrowserGlue.prototype = {
   },
 
   _migrateUI: function() {
-    const UI_VERSION = 24;
+    const UI_VERSION = 26;
     const BROWSER_DOCURL = "chrome://browser/content/browser.xul#";
     let currentUIVersion = 0;
     try {
@@ -1558,6 +1558,14 @@ BrowserGlue.prototype = {
       Services.prefs.clearUserPref("dom.abortController.enabled");
     }
 
+    if (currentUIVersion < 26) {
+      // DoNotTrack is now GPC. Carry across user preference.
+      if (Services.prefs.prefHasUserValue("privacy.donottrackheader.enabled")) {
+        let DNTEnabled = Services.prefs.getBoolPref("privacy.donottrackheader.enabled");
+        Services.prefs.setBoolPref("privacy.GPCheader.enabled", DNTEnabled);
+        Services.prefs.clearUserPref("privacy.donottrackheader.enabled");
+      }
+    }
     
     // Clear out dirty storage
     if (this._dirty) {
diff --git a/application/palemoon/components/preferences/privacy.xul b/application/palemoon/components/preferences/privacy.xul
index 50b89f1620..e5175422dc 100644
--- a/application/palemoon/components/preferences/privacy.xul
+++ b/application/palemoon/components/preferences/privacy.xul
@@ -22,9 +22,9 @@
 
     <preferences id="privacyPreferences">
 
-      <!-- Tracking -->
-      <preference id="privacy.donottrackheader.enabled"
-                  name="privacy.donottrackheader.enabled"
+      <!-- Global Privacy Control -->
+      <preference id="privacy.GPCheader.enabled"
+                  name="privacy.GPCheader.enabled"
                   type="bool"/>
 
       <!-- XXX button prefs -->
@@ -216,18 +216,18 @@
 
       </groupbox>
         
-      <!-- Tracking -->
-      <groupbox id="trackingPanel">
-        <caption>&tracking.label;</caption>
+      <!-- Global Privacy Control -->
+      <groupbox id="dataPrivacyPanel">
+        <caption>&dataPrivacy.label;</caption>
         <hbox align="center">
-          <checkbox id="privacyDoNotTrackCheckbox"
-                    label="&dntTrackingNotOkay.label2;"
-                    accesskey="&dntTrackingNotOkay.accesskey;"
-                    preference="privacy.donottrackheader.enabled"/>
+          <checkbox id="privacyGPCCheckbox"
+                    label="&sendGPCheader.label;"
+                    accesskey="&sendGPCheader.accesskey;"
+                    preference="privacy.GPCheader.enabled"/>
           <separator class="thin"/>
-          <label class="text-link" id="doNotTrackInfo"
-                 href="https://www.palemoon.org/support/do-not-track"
-                 value="&doNotTrackInfo.label;"/>
+          <label class="text-link" id="GPCInfo"
+                 href="https://www.palemoon.org/support/global-privacy-control"
+                 value="&GPCInfo.label;"/>
 
         </hbox>
       </groupbox>
diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd
index 37f8b78c0d..1e395694ce 100644
--- a/application/palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd
@@ -2,11 +2,11 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY tracking.label                 "Tracking">
+<!ENTITY  dataPrivacy.label             "Data Privacy">
 
-<!ENTITY dntTrackingNotOkay.label2      "Tell sites that I do not want to be tracked">
-<!ENTITY dntTrackingNotOkay.accesskey   "n">
-<!ENTITY doNotTrackInfo.label           "Learn More">
+<!ENTITY  sendGPCheader.label           "Tell sites not to share or sell my data">
+<!ENTITY  sendGPCheader.accesskey       "n">
+<!ENTITY  GPCInfo.label                 "Learn More">
 
 <!ENTITY  history.label                 "History">
 

From 6cefc52d328c14932bb315d8432d0065795cfddb Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Mon, 18 Oct 2021 16:19:08 +0000
Subject: [PATCH 3/3] [Basilisk] Issue #2 - Remove Safebrowsing and
 TrackingProtection from the FE

This resolves #2
---
 application/basilisk/app/profile/basilisk.js  |  12 -
 .../basilisk/base/content/blockedSite.xhtml   | 196 ----------------
 .../basilisk/base/content/browser-doctype.inc |   4 -
 .../base/content/browser-safebrowsing.js      |  48 ----
 .../content/browser-trackingprotection.js     | 130 -----------
 application/basilisk/base/content/browser.js  |  20 --
 .../basilisk/base/content/global-scripts.inc  |   4 -
 .../base/content/report-phishing-overlay.xul  |  35 ---
 .../basilisk/base/content/tab-content.js      |   5 -
 application/basilisk/base/jar.mn              |   9 -
 .../components/about/AboutRedirector.cpp      |   9 -
 .../basilisk/components/build/nsModule.cpp    |   3 -
 .../controlcenter/content/panel.inc.xul       |  31 ---
 .../components/preferences/blocklists.js      | 209 ------------------
 .../components/preferences/blocklists.xul     |  56 -----
 .../components/preferences/donottrack.xul     |  43 ----
 .../preferences/in-content/privacy.js         | 139 ------------
 .../preferences/in-content/privacy.xul        |  65 ------
 .../preferences/in-content/security.js        |  78 -------
 .../preferences/in-content/security.xul       |  42 ----
 .../basilisk/components/preferences/jar.mn    |   7 -
 .../content/aboutPrivateBrowsing.js           |  48 ----
 .../content/aboutPrivateBrowsing.xhtml        |  15 --
 application/basilisk/confvars.sh              |   1 -
 .../basilisk/installer/package-manifest.in    |  10 -
 .../chrome/browser/aboutPrivateBrowsing.dtd   |   4 -
 .../locales/en-US/chrome/browser/browser.dtd  |  27 ---
 .../en-US/chrome/browser/browser.properties   |   3 -
 .../chrome/browser/preferences/donottrack.dtd |  13 --
 .../preferences/preferences.properties        |   2 -
 .../chrome/browser/preferences/privacy.dtd    |  25 ---
 .../phishing-afterload-warning-message.dtd    |  32 ---
 .../browser/safebrowsing/report-phishing.dtd  |  13 --
 application/basilisk/locales/jar.mn           |  10 -
 .../shared/incontentprefs/preferences.inc.css |   7 -
 .../configurations/ControlCenter.jsm          |  34 ---
 36 files changed, 1389 deletions(-)
 delete mode 100644 application/basilisk/base/content/blockedSite.xhtml
 delete mode 100644 application/basilisk/base/content/browser-safebrowsing.js
 delete mode 100644 application/basilisk/base/content/browser-trackingprotection.js
 delete mode 100644 application/basilisk/base/content/report-phishing-overlay.xul
 delete mode 100644 application/basilisk/components/preferences/blocklists.js
 delete mode 100644 application/basilisk/components/preferences/blocklists.xul
 delete mode 100644 application/basilisk/components/preferences/donottrack.xul
 delete mode 100644 application/basilisk/locales/en-US/chrome/browser/preferences/donottrack.dtd
 delete mode 100644 application/basilisk/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
 delete mode 100644 application/basilisk/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd

diff --git a/application/basilisk/app/profile/basilisk.js b/application/basilisk/app/profile/basilisk.js
index df27da5089..5fe10b2016 100644
--- a/application/basilisk/app/profile/basilisk.js
+++ b/application/basilisk/app/profile/basilisk.js
@@ -944,10 +944,6 @@ pref("services.sync.prefs.sync.browser.link.open_newwindow", true);
 pref("services.sync.prefs.sync.browser.newtabpage.enabled", true);
 pref("services.sync.prefs.sync.browser.newtabpage.pinned", true);
 pref("services.sync.prefs.sync.browser.offline-apps.notify", true);
-#ifdef MOZ_SAFE_BROWSING
-pref("services.sync.prefs.sync.browser.safebrowsing.phishing.enabled", true);
-pref("services.sync.prefs.sync.browser.safebrowsing.malware.enabled", true);
-#endif
 pref("services.sync.prefs.sync.browser.search.update", true);
 pref("services.sync.prefs.sync.browser.sessionstore.restore_on_demand", true);
 pref("services.sync.prefs.sync.browser.startup.homepage", true);
@@ -992,8 +988,6 @@ pref("services.sync.prefs.sync.privacy.clearOnShutdown.sessions", true);
 pref("services.sync.prefs.sync.privacy.clearOnShutdown.siteSettings", true);
 pref("services.sync.prefs.sync.privacy.donottrackheader.enabled", true);
 pref("services.sync.prefs.sync.privacy.sanitize.sanitizeOnShutdown", true);
-pref("services.sync.prefs.sync.privacy.trackingprotection.enabled", true);
-pref("services.sync.prefs.sync.privacy.trackingprotection.pbmode.enabled", true);
 pref("services.sync.prefs.sync.security.OCSP.enabled", true);
 pref("services.sync.prefs.sync.security.OCSP.require", true);
 pref("services.sync.prefs.sync.security.default_personal_cert", true);
@@ -1202,12 +1196,6 @@ pref("browser.cache.frecency_experiment", -1);
 // Enable GMP support in the addon manager.
 pref("media.gmp-provider.enabled", true);
 
-#ifdef NIGHTLY_BUILD
-pref("privacy.trackingprotection.ui.enabled", true);
-#else
-pref("privacy.trackingprotection.ui.enabled", false);
-#endif
-
 #ifndef RELEASE_OR_BETA
 // At the moment, autostart.2 is used, while autostart.1 is unused.
 // We leave it here set to false to reset users' defaults and allow
diff --git a/application/basilisk/base/content/blockedSite.xhtml b/application/basilisk/base/content/blockedSite.xhtml
deleted file mode 100644
index 10a4b33e84..0000000000
--- a/application/basilisk/base/content/blockedSite.xhtml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE html [
-  <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
-  %htmlDTD;
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-  %brandDTD;
-  <!ENTITY % blockedSiteDTD SYSTEM "chrome://browser/locale/safebrowsing/phishing-afterload-warning-message.dtd">
-  %blockedSiteDTD;
-]>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<html xmlns="http://www.w3.org/1999/xhtml" class="blacklist">
-  <head>
-    <link rel="stylesheet" href="chrome://browser/skin/blockedSite.css" type="text/css" media="all" />
-    <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/blacklist_favicon.png"/>
-
-    <script type="application/javascript"><![CDATA[
-      // Error url MUST be formatted like this:
-      //   about:blocked?e=error_code&u=url(&o=1)?
-      //     (o=1 when user overrides are allowed)
-
-      // Note that this file uses document.documentURI to get
-      // the URL (with the format from above). This is because
-      // document.location.href gets the current URI off the docshell,
-      // which is the URL displayed in the location bar, i.e.
-      // the URI that the user attempted to load.
-
-      function getErrorCode()
-      {
-        var url = document.documentURI;
-        var error = url.search(/e\=/);
-        var duffUrl = url.search(/\&u\=/);
-        return decodeURIComponent(url.slice(error + 2, duffUrl));
-      }
-
-      function getURL()
-      {
-        var url = document.documentURI;
-        var match = url.match(/&u=([^&]+)&/);
-
-        // match == null if not found; if so, return an empty string
-        // instead of what would turn out to be portions of the URI
-        if (!match)
-          return "";
-
-        url = decodeURIComponent(match[1]);
-
-        // If this is a view-source page, then get then real URI of the page
-        if (url.startsWith("view-source:"))
-          url = url.slice(12);
-        return url;
-      }
-
-      /**
-       * Check whether this warning page should be overridable or whether
-       * the "ignore warning" button should be hidden.
-       */
-      function getOverride()
-      {
-        var url = document.documentURI;
-        var match = url.match(/&o=1&/);
-        return !!match;
-      }
-
-      /**
-       * Attempt to get the hostname via document.location.  Fail back
-       * to getURL so that we always return something meaningful.
-       */
-      function getHostString()
-      {
-        try {
-          return document.location.hostname;
-        } catch (e) {
-          return getURL();
-        }
-      }
-
-      function initPage()
-      {
-        var error = "";
-        switch (getErrorCode()) {
-          case "malwareBlocked" :
-            error = "malware";
-            break;
-          case "deceptiveBlocked" :
-            error = "phishing";
-            break;
-          case "unwantedBlocked" :
-            error = "unwanted";
-            break;
-          default:
-            return;
-        }
-
-        var el;
-
-        if (error !== "malware") {
-          el = document.getElementById("errorTitleText_malware");
-          el.parentNode.removeChild(el);
-          el = document.getElementById("errorShortDescText_malware");
-          el.parentNode.removeChild(el);
-          el = document.getElementById("errorLongDescText_malware");
-          el.parentNode.removeChild(el);
-        }
-
-        if (error !== "phishing") {
-          el = document.getElementById("errorTitleText_phishing");
-          el.parentNode.removeChild(el);
-          el = document.getElementById("errorShortDescText_phishing");
-          el.parentNode.removeChild(el);
-          el = document.getElementById("errorLongDescText_phishing");
-          el.parentNode.removeChild(el);
-        }
-
-        if (error !== "unwanted") {
-          el = document.getElementById("errorTitleText_unwanted");
-          el.parentNode.removeChild(el);
-          el = document.getElementById("errorShortDescText_unwanted");
-          el.parentNode.removeChild(el);
-          el = document.getElementById("errorLongDescText_unwanted");
-          el.parentNode.removeChild(el);
-        }
-
-        // Set sitename
-        document.getElementById(error + "_sitename").textContent = getHostString();
-        document.title = document.getElementById("errorTitleText_" + error)
-                                 .innerHTML;
-
-        if (!getOverride()) {
-          var btn = document.getElementById("ignoreWarningButton");
-          if (btn) {
-            btn.parentNode.removeChild(btn);
-          }
-        }
-
-        // Inform the test harness that we're done loading the page
-        var event = new CustomEvent("AboutBlockedLoaded");
-        document.dispatchEvent(event);
-      }
-    ]]></script>
-  </head>
-
-  <body dir="&locale.dir;">
-    <div id="errorPageContainer" class="container">
-
-      <!-- Error Title -->
-      <div id="errorTitle" class="title">
-        <h1 class="title-text" id="errorTitleText_phishing">&safeb.blocked.phishingPage.title2;</h1>
-        <h1 class="title-text" id="errorTitleText_malware">&safeb.blocked.malwarePage.title;</h1>
-        <h1 class="title-text" id="errorTitleText_unwanted">&safeb.blocked.unwantedPage.title;</h1>
-      </div>
-
-      <div id="errorLongContent">
-
-        <!-- Short Description -->
-        <div id="errorShortDesc">
-          <p id="errorShortDescText_phishing">&safeb.blocked.phishingPage.shortDesc2;</p>
-          <p id="errorShortDescText_malware">&safeb.blocked.malwarePage.shortDesc;</p>
-          <p id="errorShortDescText_unwanted">&safeb.blocked.unwantedPage.shortDesc;</p>
-        </div>
-
-        <!-- Long Description -->
-        <div id="errorLongDesc">
-          <p id="errorLongDescText_phishing">&safeb.blocked.phishingPage.longDesc2;</p>
-          <p id="errorLongDescText_malware">&safeb.blocked.malwarePage.longDesc;</p>
-          <p id="errorLongDescText_unwanted">&safeb.blocked.unwantedPage.longDesc;</p>
-        </div>
-
-        <!-- Action buttons -->
-        <div id="buttons" class="button-container">
-          <!-- Commands handled in browser.js -->
-          <button id="getMeOutButton" class="primary">&safeb.palm.accept.label;</button>
-          <div class="button-spacer"></div>
-          <button id="reportButton">&safeb.palm.reportPage.label;</button>
-        </div>
-      </div>
-      <div id="ignoreWarning">
-        <button id="ignoreWarningButton">&safeb.palm.decline.label;</button>
-      </div>
-    </div>
-    <!--
-    - Note: It is important to run the script this way, instead of using
-    - an onload handler. This is because error pages are loaded as
-    - LOAD_BACKGROUND, which means that onload handlers will not be executed.
-    -->
-    <script type="application/javascript">
-      initPage();
-    </script>
-  </body>
-</html>
diff --git a/application/basilisk/base/content/browser-doctype.inc b/application/basilisk/base/content/browser-doctype.inc
index 30d70ccea2..14f5f80bda 100644
--- a/application/basilisk/base/content/browser-doctype.inc
+++ b/application/basilisk/base/content/browser-doctype.inc
@@ -13,10 +13,6 @@
   %customizeToolbarDTD;
 <!ENTITY % placesDTD SYSTEM "chrome://browser/locale/places/places.dtd">
 %placesDTD;
-#ifdef MOZ_SAFE_BROWSING
-<!ENTITY % safebrowsingDTD SYSTEM "chrome://browser/locale/safebrowsing/phishing-afterload-warning-message.dtd">
-%safebrowsingDTD;
-#endif
 <!ENTITY % aboutHomeDTD SYSTEM "chrome://browser/locale/aboutHome.dtd">
 %aboutHomeDTD;
 #ifdef MOZ_SERVICES_SYNC
diff --git a/application/basilisk/base/content/browser-safebrowsing.js b/application/basilisk/base/content/browser-safebrowsing.js
deleted file mode 100644
index 430d84f132..0000000000
--- a/application/basilisk/base/content/browser-safebrowsing.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var gSafeBrowsing = {
-
-  setReportPhishingMenu: function() {
-    // In order to detect whether or not we're at the phishing warning
-    // page, we have to check the documentURI instead of the currentURI.
-    // This is because when the DocShell loads an error page, the
-    // currentURI stays at the original target, while the documentURI
-    // will point to the internal error page we loaded instead.
-    var docURI = gBrowser.selectedBrowser.documentURI;
-    var isPhishingPage =
-      docURI && docURI.spec.startsWith("about:blocked?e=deceptiveBlocked");
-
-    // Show/hide the appropriate menu item.
-    document.getElementById("menu_HelpPopup_reportPhishingtoolmenu")
-            .hidden = isPhishingPage;
-    document.getElementById("menu_HelpPopup_reportPhishingErrortoolmenu")
-            .hidden = !isPhishingPage;
-
-    var broadcasterId = isPhishingPage
-                        ? "reportPhishingErrorBroadcaster"
-                        : "reportPhishingBroadcaster";
-
-    var broadcaster = document.getElementById(broadcasterId);
-    if (!broadcaster)
-      return;
-
-    // Now look at the currentURI to learn which page we were trying
-    // to browse to.
-    let uri = gBrowser.currentURI;
-    if (uri && (uri.schemeIs("http") || uri.schemeIs("https")))
-      broadcaster.removeAttribute("disabled");
-    else
-      broadcaster.setAttribute("disabled", true);
-  },
-
-  /**
-   * Used to report a phishing page or a false positive
-   * @param name String One of "Phish", "Error", "Malware" or "MalwareError"
-   * @return String the report phishing URL.
-   */
-  getReportURL: function(name) {
-    return SafeBrowsing.getReportURL(name, gBrowser.currentURI);
-  }
-}
diff --git a/application/basilisk/base/content/browser-trackingprotection.js b/application/basilisk/base/content/browser-trackingprotection.js
deleted file mode 100644
index 17b1e4f989..0000000000
--- a/application/basilisk/base/content/browser-trackingprotection.js
+++ /dev/null
@@ -1,130 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var TrackingProtection = {
-  // If the user ignores the doorhanger, we stop showing it after some time.
-  PREF_ENABLED_GLOBALLY: "privacy.trackingprotection.enabled",
-  PREF_ENABLED_IN_PRIVATE_WINDOWS: "privacy.trackingprotection.pbmode.enabled",
-  enabledGlobally: false,
-  enabledInPrivateWindows: false,
-  container: null,
-  content: null,
-  icon: null,
-  activeTooltipText: null,
-  disabledTooltipText: null,
-
-  init() {
-    let $ = selector => document.querySelector(selector);
-    this.container = $("#tracking-protection-container");
-    this.content = $("#tracking-protection-content");
-    this.icon = $("#tracking-protection-icon");
-
-    this.updateEnabled();
-    Services.prefs.addObserver(this.PREF_ENABLED_GLOBALLY, this, false);
-    Services.prefs.addObserver(this.PREF_ENABLED_IN_PRIVATE_WINDOWS, this, false);
-
-    this.activeTooltipText =
-      gNavigatorBundle.getString("trackingProtection.icon.activeTooltip");
-    this.disabledTooltipText =
-      gNavigatorBundle.getString("trackingProtection.icon.disabledTooltip");
-  },
-
-  uninit() {
-    Services.prefs.removeObserver(this.PREF_ENABLED_GLOBALLY, this);
-    Services.prefs.removeObserver(this.PREF_ENABLED_IN_PRIVATE_WINDOWS, this);
-  },
-
-  observe() {
-    this.updateEnabled();
-  },
-
-  get enabled() {
-    return this.enabledGlobally ||
-           (this.enabledInPrivateWindows &&
-            PrivateBrowsingUtils.isWindowPrivate(window));
-  },
-
-  updateEnabled() {
-    this.enabledGlobally =
-      Services.prefs.getBoolPref(this.PREF_ENABLED_GLOBALLY);
-    this.enabledInPrivateWindows =
-      Services.prefs.getBoolPref(this.PREF_ENABLED_IN_PRIVATE_WINDOWS);
-    this.container.hidden = !this.enabled;
-  },
-
-  onSecurityChange(state, isSimulated) {
-    if (!this.enabled) {
-      return;
-    }
-
-    // Only animate the shield if the event was not fired directly from
-    // the tabbrowser (due to a browser change).
-    if (isSimulated) {
-      this.icon.removeAttribute("animate");
-    } else {
-      this.icon.setAttribute("animate", "true");
-    }
-
-    let isBlocking = state & Ci.nsIWebProgressListener.STATE_BLOCKED_TRACKING_CONTENT;
-    let isAllowing = state & Ci.nsIWebProgressListener.STATE_LOADED_TRACKING_CONTENT;
-
-    if (isBlocking) {
-      this.icon.setAttribute("tooltiptext", this.activeTooltipText);
-      this.icon.setAttribute("state", "blocked-tracking-content");
-      this.content.setAttribute("state", "blocked-tracking-content");
-    } else if (isAllowing) {
-      this.icon.setAttribute("tooltiptext", this.disabledTooltipText);
-      this.icon.setAttribute("state", "loaded-tracking-content");
-      this.content.setAttribute("state", "loaded-tracking-content");
-    } else {
-      this.icon.removeAttribute("tooltiptext");
-      this.icon.removeAttribute("state");
-      this.content.removeAttribute("state");
-    }
-  },
-
-  disableForCurrentPage() {
-    // Convert document URI into the format used by
-    // nsChannelClassifier::ShouldEnableTrackingProtection.
-    // Any scheme turned into https is correct.
-    let normalizedUrl = Services.io.newURI(
-      "https://" + gBrowser.selectedBrowser.currentURI.hostPort,
-      null, null);
-
-    // Add the current host in the 'trackingprotection' consumer of
-    // the permission manager using a normalized URI. This effectively
-    // places this host on the tracking protection allowlist.
-    if (PrivateBrowsingUtils.isBrowserPrivate(gBrowser.selectedBrowser)) {
-      PrivateBrowsingUtils.addToTrackingAllowlist(normalizedUrl);
-    } else {
-      Services.perms.add(normalizedUrl,
-        "trackingprotection", Services.perms.ALLOW_ACTION);
-    }
-
-    // Hide the control center.
-    document.getElementById("identity-popup").hidePopup();
-
-    BrowserReload();
-  },
-
-  enableForCurrentPage() {
-    // Remove the current host from the 'trackingprotection' consumer
-    // of the permission manager. This effectively removes this host
-    // from the tracking protection allowlist.
-    let normalizedUrl = Services.io.newURI(
-      "https://" + gBrowser.selectedBrowser.currentURI.hostPort,
-      null, null);
-
-    if (PrivateBrowsingUtils.isBrowserPrivate(gBrowser.selectedBrowser)) {
-      PrivateBrowsingUtils.removeFromTrackingAllowlist(normalizedUrl);
-    } else {
-      Services.perms.remove(normalizedUrl, "trackingprotection");
-    }
-
-    // Hide the control center.
-    document.getElementById("identity-popup").hidePopup();
-
-    BrowserReload();
-  },
-};
diff --git a/application/basilisk/base/content/browser.js b/application/basilisk/base/content/browser.js
index ea0061e17a..39739497bd 100644
--- a/application/basilisk/base/content/browser.js
+++ b/application/basilisk/base/content/browser.js
@@ -50,11 +50,6 @@ Cu.import("resource://gre/modules/NotificationDB.jsm");
   ["webrtcUI", "resource:///modules/webrtcUI.jsm", ]
 ].forEach(([name, resource]) => XPCOMUtils.defineLazyModuleGetter(this, name, resource));
 
-#ifdef MOZ_SAFE_BROWSING
-  XPCOMUtils.defineLazyModuleGetter(this, "SafeBrowsing",
-    "resource://gre/modules/SafeBrowsing.jsm");
-#endif
-
 // lazy service getters
 [
   ["Favicons", "@mozilla.org/browser/favicon-service;1", "mozIAsyncFavicons"],
@@ -959,7 +954,6 @@ var gBrowserInit = {
     BrowserOnClick.init();
     FeedHandler.init();
     AboutPrivateBrowsingListener.init();
-    TrackingProtection.init();
     RefreshBlocker.init();
     CaptivePortalWatcher.init();
 
@@ -1168,11 +1162,6 @@ var gBrowserInit = {
       }
     }
 
-#ifdef MOZ_SAFE_BROWSING
-    // Bug 778855 - Perf regression if we do this here. To be addressed in bug 779008.
-    setTimeout(function() { SafeBrowsing.init(); }, 2000);
-#endif
-
     Services.obs.addObserver(gIdentityHandler, "perm-changed", false);
     Services.obs.addObserver(gSessionHistoryObserver, "browser:purge-session-history", false);
     Services.obs.addObserver(gXPInstallObserver, "addon-install-disabled", false);
@@ -1442,8 +1431,6 @@ var gBrowserInit = {
 
     FeedHandler.uninit();
 
-    TrackingProtection.uninit();
-
     RefreshBlocker.uninit();
 
     CaptivePortalWatcher.uninit();
@@ -4188,7 +4175,6 @@ var XULBrowserWindow = {
       uri = Services.uriFixup.createExposableURI(uri);
     } catch (e) {}
     gIdentityHandler.updateIdentity(this._state, uri);
-    TrackingProtection.onSecurityChange(this._state, aIsSimulated);
   },
 
   // simulate all change notifications after switching tabs
@@ -7625,12 +7611,6 @@ var AboutPrivateBrowsingListener = {
       msg => {
         OpenBrowserWindow({private: true});
     });
-    window.messageManager.addMessageListener(
-      "AboutPrivateBrowsing:ToggleTrackingProtection",
-      msg => {
-        const PREF = "privacy.trackingprotection.pbmode.enabled";
-        Services.prefs.setBoolPref(PREF, !Services.prefs.getBoolPref(PREF));
-    });
   }
 };
 
diff --git a/application/basilisk/base/content/global-scripts.inc b/application/basilisk/base/content/global-scripts.inc
index 6edb112140..d97485697f 100644
--- a/application/basilisk/base/content/global-scripts.inc
+++ b/application/basilisk/base/content/global-scripts.inc
@@ -22,13 +22,9 @@
 <script type="application/javascript" src="chrome://browser/content/browser-places.js"/>
 <script type="application/javascript" src="chrome://browser/content/browser-plugins.js"/>
 <script type="application/javascript" src="chrome://browser/content/browser-refreshblocker.js"/>
-#ifdef MOZ_SAFE_BROWSING
-<script type="application/javascript" src="chrome://browser/content/browser-safebrowsing.js"/>
-#endif
 <script type="application/javascript" src="chrome://browser/content/browser-sidebar.js"/>
 <script type="application/javascript" src="chrome://browser/content/browser-tabsintitlebar.js"/>
 <script type="application/javascript" src="chrome://browser/content/browser-thumbnails.js"/>
-<script type="application/javascript" src="chrome://browser/content/browser-trackingprotection.js"/>
 
 #ifdef MOZ_DATA_REPORTING
 <script type="application/javascript" src="chrome://browser/content/browser-data-submission-info-bar.js"/>
diff --git a/application/basilisk/base/content/report-phishing-overlay.xul b/application/basilisk/base/content/report-phishing-overlay.xul
deleted file mode 100644
index 712079f824..0000000000
--- a/application/basilisk/base/content/report-phishing-overlay.xul
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!DOCTYPE overlay [
-<!ENTITY % reportphishDTD SYSTEM "chrome://browser/locale/safebrowsing/report-phishing.dtd">
-%reportphishDTD;
-<!ENTITY % safebrowsingDTD SYSTEM "chrome://browser/locale/safebrowsing/phishing-afterload-warning-message.dtd">
-%safebrowsingDTD;
-]>
-
-<overlay id="reportPhishingMenuOverlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <broadcasterset id="mainBroadcasterSet">
-    <broadcaster id="reportPhishingBroadcaster" disabled="true"/>
-    <broadcaster id="reportPhishingErrorBroadcaster" disabled="true"/>
-  </broadcasterset>
-  <menupopup id="menu_HelpPopup">
-    <menuitem id="menu_HelpPopup_reportPhishingtoolmenu"
-              label="&reportDeceptiveSiteMenu.title;"
-              accesskey="&reportDeceptiveSiteMenu.accesskey;"
-              insertbefore="aboutSeparator"
-              observes="reportPhishingBroadcaster"
-              oncommand="openUILink(gSafeBrowsing.getReportURL('Phish'), event);"
-              onclick="checkForMiddleClick(this, event);"/>
-    <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu"
-              label="&safeb.palm.notdeceptive.label;"
-              accesskey="&safeb.palm.notdeceptive.accesskey;"
-              insertbefore="aboutSeparator"
-              observes="reportPhishingErrorBroadcaster"
-              oncommand="openUILinkIn(gSafeBrowsing.getReportURL('PhishMistake'), 'tab');"
-              onclick="checkForMiddleClick(this, event);"/>
-  </menupopup>
-</overlay>
diff --git a/application/basilisk/base/content/tab-content.js b/application/basilisk/base/content/tab-content.js
index 3e0d9d7bc7..8101cbd85c 100644
--- a/application/basilisk/base/content/tab-content.js
+++ b/application/basilisk/base/content/tab-content.js
@@ -198,8 +198,6 @@ var AboutPrivateBrowsingListener = {
   init(chromeGlobal) {
     chromeGlobal.addEventListener("AboutPrivateBrowsingOpenWindow", this,
                                   false, true);
-    chromeGlobal.addEventListener("AboutPrivateBrowsingToggleTrackingProtection", this,
-                                  false, true);
   },
 
   get isAboutPrivateBrowsing() {
@@ -214,9 +212,6 @@ var AboutPrivateBrowsingListener = {
       case "AboutPrivateBrowsingOpenWindow":
         sendAsyncMessage("AboutPrivateBrowsing:OpenPrivateWindow");
         break;
-      case "AboutPrivateBrowsingToggleTrackingProtection":
-        sendAsyncMessage("AboutPrivateBrowsing:ToggleTrackingProtection");
-        break;
     }
   },
 };
diff --git a/application/basilisk/base/jar.mn b/application/basilisk/base/jar.mn
index 47c4dd6a24..fd218f1eef 100644
--- a/application/basilisk/base/jar.mn
+++ b/application/basilisk/base/jar.mn
@@ -74,9 +74,6 @@ browser.jar:
 *       content/browser/browser-places.js             (content/browser-places.js)
         content/browser/browser-plugins.js            (content/browser-plugins.js)
         content/browser/browser-refreshblocker.js     (content/browser-refreshblocker.js)
-#ifdef MOZ_SAFE_BROWSING
-        content/browser/browser-safebrowsing.js       (content/browser-safebrowsing.js)
-#endif
         content/browser/browser-sidebar.js            (content/browser-sidebar.js)
 *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
 #ifdef MOZ_CAN_DRAW_IN_TITLEBAR
@@ -85,7 +82,6 @@ browser.jar:
         content/browser/browser-tabsintitlebar.js       (content/browser-tabsintitlebar-stub.js)
 #endif
         content/browser/browser-thumbnails.js         (content/browser-thumbnails.js)
-        content/browser/browser-trackingprotection.js (content/browser-trackingprotection.js)
 *       content/browser/tab-content.js                (content/tab-content.js)
         content/browser/content.js                    (content/content.js)
         content/browser/defaultthemes/1.footer.jpg    (content/defaultthemes/1.footer.jpg)
@@ -159,10 +155,5 @@ browser.jar:
 # the following files are browser-specific overrides
 *       content/browser/license.html                  (/toolkit/content/license.html)
 % override chrome://global/content/license.html chrome://browser/content/license.html
-#ifdef MOZ_SAFE_BROWSING
-        content/browser/report-phishing-overlay.xul     (content/report-phishing-overlay.xul)
-        content/browser/blockedSite.xhtml               (content/blockedSite.xhtml)
-% overlay chrome://browser/content/browser.xul chrome://browser/content/report-phishing-overlay.xul
-#endif
 
 % override chrome://global/content/netError.xhtml chrome://browser/content/aboutNetError.xhtml
diff --git a/application/basilisk/components/about/AboutRedirector.cpp b/application/basilisk/components/about/AboutRedirector.cpp
index d52b063e23..db6a65b9f4 100644
--- a/application/basilisk/components/about/AboutRedirector.cpp
+++ b/application/basilisk/components/about/AboutRedirector.cpp
@@ -40,15 +40,6 @@ static RedirEntry kRedirMap[] = {
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
     nsIAboutModule::HIDE_FROM_ABOUTABOUT
   },
-#ifdef MOZ_SAFE_BROWSING
-  {
-    "blocked", "chrome://browser/content/blockedSite.xhtml",
-    nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
-    nsIAboutModule::URI_CAN_LOAD_IN_CHILD |
-    nsIAboutModule::ALLOW_SCRIPT |
-    nsIAboutModule::HIDE_FROM_ABOUTABOUT
-  },
-#endif
   {
     "certerror", "chrome://browser/content/aboutNetError.xhtml",
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
diff --git a/application/basilisk/components/build/nsModule.cpp b/application/basilisk/components/build/nsModule.cpp
index 3fdde8823a..bba25639a3 100644
--- a/application/basilisk/components/build/nsModule.cpp
+++ b/application/basilisk/components/build/nsModule.cpp
@@ -86,9 +86,6 @@ static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
 #endif
     { NS_FEEDSNIFFER_CONTRACTID, &kNS_FEEDSNIFFER_CID },
     { NS_ABOUT_MODULE_CONTRACTID_PREFIX "basilisk", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
-#ifdef MOZ_SAFE_BROWSING
-    { NS_ABOUT_MODULE_CONTRACTID_PREFIX "blocked", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
-#endif
     { NS_ABOUT_MODULE_CONTRACTID_PREFIX "certerror", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
     { NS_ABOUT_MODULE_CONTRACTID_PREFIX "tabcrashed", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
     { NS_ABOUT_MODULE_CONTRACTID_PREFIX "feeds", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
diff --git a/application/basilisk/components/controlcenter/content/panel.inc.xul b/application/basilisk/components/controlcenter/content/panel.inc.xul
index 361b3c945f..7f5793c0d9 100644
--- a/application/basilisk/components/controlcenter/content/panel.inc.xul
+++ b/application/basilisk/components/controlcenter/content/panel.inc.xul
@@ -54,37 +54,6 @@
                 oncommand="gIdentityHandler.toggleSubView('security', this)"/>
       </hbox>
 
-      <!-- Tracking Protection Section -->
-      <hbox id="tracking-protection-container"
-            class="identity-popup-section"
-            when-connection="not-secure secure secure-ev secure-cert-user-overridden file">
-        <vbox id="tracking-protection-content" flex="1">
-          <description class="identity-popup-headline"
-                       crop="end"
-                       value="&trackingProtection.title;" />
-
-          <label id="tracking-blocked"
-                 crop="end">&trackingProtection.detectedBlocked3;</label>
-          <label id="tracking-loaded"
-                 crop="end">&trackingProtection.detectedNotBlocked3;</label>
-          <label id="tracking-not-detected"
-                 crop="end">&trackingProtection.notDetected3;</label>
-
-          <button id="tracking-action-unblock"
-                  label="&trackingProtection.unblock.label;"
-                  accesskey="&trackingProtection.unblock.accesskey;"
-                  oncommand="TrackingProtection.disableForCurrentPage();" />
-          <button id="tracking-action-unblock-private"
-                  label="&trackingProtection.unblockPrivate.label;"
-                  accesskey="&trackingProtection.unblockPrivate.accesskey;"
-                  oncommand="TrackingProtection.disableForCurrentPage();" />
-          <button id="tracking-action-block"
-                  label="&trackingProtection.block2.label;"
-                  accesskey="&trackingProtection.block2.accesskey;"
-                  oncommand="TrackingProtection.enableForCurrentPage();" />
-        </vbox>
-      </hbox>
-
       <!-- Permissions Section -->
       <hbox class="identity-popup-section">
         <vbox id="identity-popup-permissions-content" flex="1">
diff --git a/application/basilisk/components/preferences/blocklists.js b/application/basilisk/components/preferences/blocklists.js
deleted file mode 100644
index bc39eb6bd9..0000000000
--- a/application/basilisk/components/preferences/blocklists.js
+++ /dev/null
@@ -1,209 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-Components.utils.import("resource://gre/modules/Services.jsm");
-const BASE_LIST_ID = "base";
-const CONTENT_LIST_ID = "content";
-const TRACK_SUFFIX = "-track-digest256";
-const TRACKING_TABLE_PREF = "urlclassifier.trackingTable";
-const LISTS_PREF_BRANCH = "browser.safebrowsing.provider.mozilla.lists.";
-const UPDATE_TIME_PREF = "browser.safebrowsing.provider.mozilla.nextupdatetime";
-
-var gBlocklistManager = {
-  _type: "",
-  _blockLists: [],
-  _brandShortName : null,
-  _bundle: null,
-  _tree: null,
-
-  _view: {
-    _rowCount: 0,
-    get rowCount() {
-      return this._rowCount;
-    },
-    getCellText: function (row, column) {
-      if (column.id == "listCol") {
-        let list = gBlocklistManager._blockLists[row];
-        let desc = list.description ? list.description : "";
-        let text = gBlocklistManager._bundle.getFormattedString("mozNameTemplate",
-                                                                [list.name, desc]);
-        return text;
-      }
-      return "";
-    },
-
-    isSeparator: function(index) { return false; },
-    isSorted: function() { return false; },
-    isContainer: function(index) { return false; },
-    setTree: function(tree) {},
-    getImageSrc: function(row, column) {},
-    getProgressMode: function(row, column) {},
-    getCellValue: function(row, column) {
-      if (column.id == "selectionCol")
-        return gBlocklistManager._blockLists[row].selected;
-      return undefined;
-    },
-    cycleHeader: function(column) {},
-    getRowProperties: function(row) { return ""; },
-    getColumnProperties: function(column) { return ""; },
-    getCellProperties: function(row, column) {
-      if (column.id == "selectionCol") {
-        return "checkmark";
-      }
-
-      return "";
-    }
-  },
-
-  onWindowKeyPress: function (event) {
-    if (event.keyCode == KeyEvent.DOM_VK_ESCAPE) {
-      window.close();
-    } else if (event.keyCode == KeyEvent.DOM_VK_RETURN) {
-      gBlocklistManager.onApplyChanges();
-    }
-  },
-
-  onLoad: function () {
-    this._bundle = document.getElementById("bundlePreferences");
-    let params = window.arguments[0];
-    this.init(params);
-  },
-
-  init: function (params) {
-    if (this._type) {
-      // reusing an open dialog, clear the old observer
-      this.uninit();
-    }
-
-    this._type = "tracking";
-    this._brandShortName = params.brandShortName;
-
-    let blocklistsText = document.getElementById("blocklistsText");
-    while (blocklistsText.hasChildNodes()) {
-      blocklistsText.removeChild(blocklistsText.firstChild);
-    }
-    blocklistsText.appendChild(document.createTextNode(params.introText));
-
-    document.title = params.windowTitle;
-
-    let treecols = document.getElementsByTagName("treecols")[0];
-    treecols.addEventListener("click", event => {
-      if (event.target.nodeName != "treecol" || event.button != 0) {
-        return;
-      }
-    });
-
-    this._loadBlockLists();
-  },
-
-  uninit: function () {},
-
-  onListSelected: function () {
-    for (let list of this._blockLists) {
-      list.selected = false;
-    }
-    this._blockLists[this._tree.currentIndex].selected = true;
-
-    this._updateTree();
-  },
-
-  onApplyChanges: function () {
-    let activeList = this._getActiveList();
-    let selected = null;
-    for (let list of this._blockLists) {
-      if (list.selected) {
-        selected = list;
-        break;
-      }
-    }
-
-    if (activeList !== selected.id) {
-      const Cc = Components.classes, Ci = Components.interfaces;
-      let msg = this._bundle.getFormattedString("blocklistChangeRequiresRestart",
-                                                [this._brandShortName]);
-      let title = this._bundle.getFormattedString("shouldRestartTitle",
-                                                  [this._brandShortName]);
-      let shouldProceed = Services.prompt.confirm(window, title, msg);
-      if (shouldProceed) {
-        let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"]
-                           .createInstance(Ci.nsISupportsPRBool);
-        Services.obs.notifyObservers(cancelQuit, "quit-application-requested",
-                                     "restart");
-        shouldProceed = !cancelQuit.data;
-
-        if (shouldProceed) {
-          let trackingTable = Services.prefs.getCharPref(TRACKING_TABLE_PREF);
-          if (selected.id != CONTENT_LIST_ID) {
-            trackingTable = trackingTable.replace("," + CONTENT_LIST_ID + TRACK_SUFFIX, "");
-          } else {
-            trackingTable += "," + CONTENT_LIST_ID + TRACK_SUFFIX;
-          }
-          Services.prefs.setCharPref(TRACKING_TABLE_PREF, trackingTable);
-          Services.prefs.setCharPref(UPDATE_TIME_PREF, 42);
-
-          Services.startup.quit(Ci.nsIAppStartup.eAttemptQuit |
-                                Ci.nsIAppStartup.eRestart);
-        }
-      }
-
-      // Don't close the dialog in case we didn't quit.
-      return;
-    }
-    window.close();
-  },
-
-  _loadBlockLists: function () {
-    this._blockLists = [];
-
-    // Load blocklists into a table.
-    let branch = Services.prefs.getBranch(LISTS_PREF_BRANCH);
-    let itemArray = branch.getChildList("");
-    for (let itemName of itemArray) {
-      try {
-        this._createOrUpdateBlockList(itemName);
-      } catch (e) {
-        // Ignore bogus or missing list name.
-        continue;
-      }
-    }
-
-    this._updateTree();
-  },
-
-  _createOrUpdateBlockList: function (itemName) {
-    let branch = Services.prefs.getBranch(LISTS_PREF_BRANCH);
-    let key = branch.getCharPref(itemName);
-    let value = this._bundle.getString(key);
-
-    let suffix = itemName.slice(itemName.lastIndexOf("."));
-    let id = itemName.replace(suffix, "");
-    let list = this._blockLists.find(el => el.id === id);
-    if (!list) {
-      list = { id };
-      this._blockLists.push(list);
-    }
-    list.selected = this._getActiveList() === id;
-
-    // Get the property name from the suffix (e.g. ".name" -> "name").
-    let prop = suffix.slice(1);
-    list[prop] = value;
-
-    return list;
-  },
-
-  _updateTree: function () {
-    this._tree = document.getElementById("blocklistsTree");
-    this._view._rowCount = this._blockLists.length;
-    this._tree.view = this._view;
-  },
-
-  _getActiveList: function () {
-    let trackingTable = Services.prefs.getCharPref(TRACKING_TABLE_PREF);
-    return trackingTable.includes(CONTENT_LIST_ID) ? CONTENT_LIST_ID : BASE_LIST_ID;
-  }
-};
-
-function initWithParams(params) {
-  gBlocklistManager.init(params);
-}
diff --git a/application/basilisk/components/preferences/blocklists.xul b/application/basilisk/components/preferences/blocklists.xul
deleted file mode 100644
index 523c208108..0000000000
--- a/application/basilisk/components/preferences/blocklists.xul
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
-
-<!DOCTYPE dialog SYSTEM "chrome://browser/locale/preferences/blocklists.dtd" >
-
-<window id="BlocklistsDialog" class="windowDialog"
-        windowtype="Browser:Blocklists"
-        title="&window.title;"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        style="width: &window.width;;"
-        onload="gBlocklistManager.onLoad();"
-        onunload="gBlocklistManager.uninit();"
-        persist="screenX screenY width height"
-        onkeypress="gBlocklistManager.onWindowKeyPress(event);">
-
-  <script src="chrome://global/content/treeUtils.js"/>
-  <script src="chrome://browser/content/preferences/blocklists.js"/>
-
-  <stringbundle id="bundlePreferences"
-                src="chrome://browser/locale/preferences/preferences.properties"/>
-
-  <keyset>
-    <key key="&windowClose.key;" modifiers="accel" oncommand="window.close();"/>
-  </keyset>
-
-  <vbox class="contentPane largeDialogContainer" flex="1">
-    <description id="blocklistsText" control="url"/>
-    <separator class="thin"/>
-    <tree id="blocklistsTree" flex="1" style="height: 18em;"
-          hidecolumnpicker="true"
-          onselect="gBlocklistManager.onListSelected();">
-      <treecols>
-        <treecol id="selectionCol" label="" flex="1" sortable="false"
-                 type="checkbox"/>
-        <treecol id="listCol" label="&treehead.list.label;" flex="80"
-                 sortable="false"/>
-      </treecols>
-      <treechildren/>
-    </tree>
-  </vbox>
-  <vbox>
-    <spacer flex="1"/>
-    <hbox class="actionButtons" align="right" flex="1">
-      <button oncommand="close();" icon="close"
-              label="&button.cancel.label;" accesskey="&button.cancel.accesskey;" />
-      <button id="btnApplyChanges" oncommand="gBlocklistManager.onApplyChanges();" icon="save"
-              label="&button.ok.label;" accesskey="&button.ok.accesskey;"/>
-    </hbox>
-  </vbox>
-</window>
diff --git a/application/basilisk/components/preferences/donottrack.xul b/application/basilisk/components/preferences/donottrack.xul
deleted file mode 100644
index d0631ac4f2..0000000000
--- a/application/basilisk/components/preferences/donottrack.xul
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<?xml-stylesheet href="chrome://global/skin/"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-
-<!DOCTYPE prefwindow [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-<!ENTITY % doNotTrackDTD SYSTEM "chrome://browser/locale/preferences/donottrack.dtd">
-%brandDTD;
-%doNotTrackDTD;
-]>
-
-<prefwindow id="DoNotTrackDialog" type="child"
-            xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-            xmlns:html="http://www.w3.org/1999/xhtml"
-            title="&window.title;"
-            style="width: &window.width;; height: &window.height;;"
-            dlgbuttons="accept,cancel">
-  <prefpane>
-    <preferences>
-      <preference id="privacy.donottrackheader.enabled"
-                  name="privacy.donottrackheader.enabled"
-                  type="bool"/>
-    </preferences>
-    <hbox align="center" pack="start">
-      <!-- Work around focus ring not showing properly. -->
-      <spacer style="width: 1em;"/>
-      <checkbox label="&doNotTrackCheckbox2.label;"
-                accesskey="&doNotTrackCheckbox2.accesskey;"
-                preference="privacy.donottrackheader.enabled"/>
-    </hbox>
-    <description flex="1" class="doNotTrackLearnMore">
-      &doNotTrackTPInfo.description;
-      <label class="text-link"
-             value="&doNotTrackLearnMore.label;"
-             href="https://www.mozilla.org/dnt"/>
-    </description>
-  </prefpane>
-</prefwindow>
diff --git a/application/basilisk/components/preferences/in-content/privacy.js b/application/basilisk/components/preferences/in-content/privacy.js
index 0774ecc596..fe26673623 100644
--- a/application/basilisk/components/preferences/in-content/privacy.js
+++ b/application/basilisk/components/preferences/in-content/privacy.js
@@ -20,37 +20,6 @@ var gPrivacyPane = {
    */
   _shouldPromptForRestart: true,
 
-#ifdef MOZ_SAFE_BROWSING
-  /**
-   * Show the Tracking Protection UI depending on the
-   * privacy.trackingprotection.ui.enabled pref, and linkify its Learn More link
-   */
-  _initTrackingProtection: function () {
-    if (!Services.prefs.getBoolPref("privacy.trackingprotection.ui.enabled")) {
-      return;
-    }
-
-    let link = document.getElementById("trackingProtectionLearnMore");
-    let url = Services.urlFormatter.formatURLPref("app.support.baseURL") + "tracking-protection";
-    link.setAttribute("href", url);
-
-    this.trackingProtectionReadPrefs();
-
-    document.getElementById("trackingprotectionbox").hidden = false;
-    document.getElementById("trackingprotectionpbmbox").hidden = true;
-  },
-
-  /**
-   * Linkify the Learn More link of the Private Browsing Mode Tracking
-   * Protection UI.
-   */
-  _initTrackingProtectionPBM: function () {
-    let link = document.getElementById("trackingProtectionPBMLearnMore");
-    let url = Services.urlFormatter.formatURLPref("app.support.baseURL") + "tracking-protection-pbm";
-    link.setAttribute("href", url);
-  },
-#endif
-
   /**
    * Initialize autocomplete to ensure prefs are in sync.
    */
@@ -76,10 +45,6 @@ var gPrivacyPane = {
     this.updateHistoryModePane();
     this.updatePrivacyMicroControls();
     this.initAutoStartPrivateBrowsingReverter();
-#ifdef MOZ_SAFE_BROWSING
-    this._initTrackingProtection();
-    this._initTrackingProtectionPBM();
-#endif
     this._initAutocomplete();
 
     setEventListener("privacy.sanitize.sanitizeOnShutdown", "change",
@@ -104,12 +69,6 @@ var gPrivacyPane = {
       gPrivacyPane.clearPrivateDataNow(true);
       return false;
     });
-#ifdef MOZ_SAFE_BROWSING
-    setEventListener("doNotTrackSettings", "click", function () {
-      gPrivacyPane.showDoNotTrackSettings();
-      return false;
-    });
-#endif
     setEventListener("privateBrowsingAutoStart", "command",
                      gPrivacyPane.updateAutostart);
     setEventListener("cookieExceptions", "command",
@@ -118,64 +77,8 @@ var gPrivacyPane = {
                      gPrivacyPane.showCookies);
     setEventListener("clearDataSettings", "command",
                      gPrivacyPane.showClearPrivateDataSettings);
-#ifdef MOZ_SAFE_BROWSING
-    setEventListener("trackingProtectionRadioGroup", "command",
-                     gPrivacyPane.trackingProtectionWritePrefs);
-    setEventListener("trackingProtectionExceptions", "command",
-                     gPrivacyPane.showTrackingProtectionExceptions);
-    setEventListener("changeBlockList", "command",
-                     gPrivacyPane.showBlockLists);
-    setEventListener("changeBlockListPBM", "command",
-                     gPrivacyPane.showBlockLists);
-#endif
   },
 
-#ifdef MOZ_SAFE_BROWSING
-  // TRACKING PROTECTION MODE
-
-  /**
-   * Selects the right item of the Tracking Protection radiogroup.
-   */
-  trackingProtectionReadPrefs() {
-    let enabledPref = document.getElementById("privacy.trackingprotection.enabled");
-    let pbmPref = document.getElementById("privacy.trackingprotection.pbmode.enabled");
-    let radiogroup = document.getElementById("trackingProtectionRadioGroup");
-
-    // Global enable takes precedence over enabled in Private Browsing.
-    if (enabledPref.value) {
-      radiogroup.value = "always";
-    } else if (pbmPref.value) {
-      radiogroup.value = "private";
-    } else {
-      radiogroup.value = "never";
-    }
-  },
-
-  /**
-   * Sets the pref values based on the selected item of the radiogroup.
-   */
-  trackingProtectionWritePrefs() {
-    let enabledPref = document.getElementById("privacy.trackingprotection.enabled");
-    let pbmPref = document.getElementById("privacy.trackingprotection.pbmode.enabled");
-    let radiogroup = document.getElementById("trackingProtectionRadioGroup");
-
-    switch (radiogroup.value) {
-      case "always":
-        enabledPref.value = true;
-        pbmPref.value = true;
-        break;
-      case "private":
-        enabledPref.value = false;
-        pbmPref.value = true;
-        break;
-      case "never":
-        enabledPref.value = false;
-        pbmPref.value = false;
-        break;
-    }
-  },
-#endif
-
   // HISTORY MODE
 
   /**
@@ -412,48 +315,6 @@ var gPrivacyPane = {
       this._shouldPromptForRestart = true;
   },
 
-#ifdef MOZ_SAFE_BROWSING
-  /**
-   * Displays fine-grained, per-site preferences for tracking protection.
-   */
-  showTrackingProtectionExceptions() {
-    let bundlePreferences = document.getElementById("bundlePreferences");
-    let params = {
-      permissionType: "trackingprotection",
-      hideStatusColumn: true,
-      windowTitle: bundlePreferences.getString("trackingprotectionpermissionstitle"),
-      introText: bundlePreferences.getString("trackingprotectionpermissionstext"),
-    };
-    gSubDialog.open("chrome://browser/content/preferences/permissions.xul",
-                    null, params);
-  },
-#endif
-
-#ifdef MOZ_SAFE_BROWSING
-  /**
-   * Displays the available block lists for tracking protection.
-   */
-  showBlockLists: function ()
-  {
-    var bundlePreferences = document.getElementById("bundlePreferences");
-    let brandName = document.getElementById("bundleBrand")
-                            .getString("brandShortName");
-    var params = { brandShortName: brandName,
-                   windowTitle: bundlePreferences.getString("blockliststitle"),
-                   introText: bundlePreferences.getString("blockliststext") };
-    gSubDialog.open("chrome://browser/content/preferences/blocklists.xul",
-                    null, params);
-  },
-
-  /**
-   * Displays the Do Not Track settings dialog.
-   */
-  showDoNotTrackSettings() {
-    gSubDialog.open("chrome://browser/content/preferences/donottrack.xul",
-                    "resizable=no");
-  },
-#endif
-
   // HISTORY
 
   /*
diff --git a/application/basilisk/components/preferences/in-content/privacy.xul b/application/basilisk/components/preferences/in-content/privacy.xul
index 691cd6bf9b..917e2e6692 100644
--- a/application/basilisk/components/preferences/in-content/privacy.xul
+++ b/application/basilisk/components/preferences/in-content/privacy.xul
@@ -10,18 +10,9 @@
 <preferences id="privacyPreferences" hidden="true" data-category="panePrivacy">
 
   <!-- Tracking -->
-#ifdef MOZ_SAFE_BROWSING
-  <preference id="privacy.trackingprotection.enabled"
-              name="privacy.trackingprotection.enabled"
-              type="bool"/>
-  <preference id="privacy.trackingprotection.pbmode.enabled"
-              name="privacy.trackingprotection.pbmode.enabled"
-              type="bool"/>
-#else
   <preference id="privacy.donottrackheader.enabled"
               name="privacy.donottrackheader.enabled"
               type="bool"/>
-#endif
 
   <!-- XXX button prefs -->
   <preference id="pref.privacy.disable_button.cookie_exceptions"
@@ -91,61 +82,6 @@
 
 <!-- Tracking -->
 <groupbox id="trackingGroup" data-category="panePrivacy" hidden="true">
-#ifdef MOZ_SAFE_BROWSING
-  <vbox id="trackingprotectionbox" hidden="true">
-    <hbox align="start">
-      <vbox>
-        <caption><label>&trackingProtectionHeader.label;
-          <label id="trackingProtectionLearnMore" class="text-link"
-                 value="&trackingProtectionLearnMore.label;"/>
-        </label></caption>
-        <radiogroup id="trackingProtectionRadioGroup">
-          <radio value="always"
-                 label="&trackingProtectionAlways.label;"
-                 accesskey="&trackingProtectionAlways.accesskey;"/>
-          <radio value="private"
-                 label="&trackingProtectionPrivate.label;"
-                 accesskey="&trackingProtectionPrivate.accesskey;"/>
-          <radio value="never"
-                 label="&trackingProtectionNever.label;"
-                 accesskey="&trackingProtectionNever.accesskey;"/>
-        </radiogroup>
-      </vbox>
-      <spacer flex="1" />
-      <vbox>
-        <button id="trackingProtectionExceptions"
-                label="&trackingProtectionExceptions.label;"
-                accesskey="&trackingProtectionExceptions.accesskey;"
-                preference="pref.privacy.disable_button.tracking_protection_exceptions"/>
-        <button id="changeBlockList"
-                label="&changeBlockList.label;"
-                accesskey="&changeBlockList.accesskey;"
-                preference="pref.privacy.disable_button.change_blocklist"/>
-      </vbox>
-    </hbox>
-  </vbox>
-  <vbox id="trackingprotectionpbmbox">
-    <caption><label>&tracking.label;</label></caption>
-    <hbox align="center">
-      <checkbox id="trackingProtectionPBM"
-                preference="privacy.trackingprotection.pbmode.enabled"
-                accesskey="&trackingProtectionPBM5.accesskey;"
-                label="&trackingProtectionPBM5.label;" />
-      <label id="trackingProtectionPBMLearnMore"
-             class="text-link"
-             value="&trackingProtectionPBMLearnMore.label;"/>
-      <spacer flex="1" />
-      <button id="changeBlockListPBM"
-              label="&changeBlockList.label;" accesskey="&changeBlockList.accesskey;"
-              preference="pref.privacy.disable_button.change_blocklist"/>
-    </hbox>
-  </vbox>
-  <vbox>
-    <description>&doNotTrack.pre.label;<label
-    class="text-link" id="doNotTrackSettings"
-    >&doNotTrack.settings.label;</label>&doNotTrack.post.label;</description>
-  </vbox>
-#else
   <vbox id="donottrackbox">
     <caption><label>&tracking.label;</label></caption>
     <hbox align="center">
@@ -158,7 +94,6 @@
              href="https://www.mozilla.org/dnt"/>
     </hbox>
   </vbox>
-#endif
 </groupbox>
 
 <!-- History -->
diff --git a/application/basilisk/components/preferences/in-content/security.js b/application/basilisk/components/preferences/in-content/security.js
index 37a187f9c9..01cf410f6f 100644
--- a/application/basilisk/components/preferences/in-content/security.js
+++ b/application/basilisk/components/preferences/in-content/security.js
@@ -23,9 +23,6 @@ var gSecurityPane = {
 
     this._pane = document.getElementById("paneSecurity");
     this._initMasterPasswordUI();
-#ifdef MOZ_SAFE_BROWSING
-    this._initSafeBrowsing();
-#endif
 
     setEventListener("addonExceptions", "command",
       gSecurityPane.showAddonExceptions);
@@ -162,81 +159,6 @@ var gSecurityPane = {
     checkbox.checked = !noMP;
   },
 
-#ifdef MOZ_SAFE_BROWSING
-  _initSafeBrowsing() {
-    let enableSafeBrowsing = document.getElementById("enableSafeBrowsing");
-    let blockDownloads = document.getElementById("blockDownloads");
-    let blockUncommonUnwanted = document.getElementById("blockUncommonUnwanted");
-
-    let safeBrowsingPhishingPref = document.getElementById("browser.safebrowsing.phishing.enabled");
-    let safeBrowsingMalwarePref = document.getElementById("browser.safebrowsing.malware.enabled");
-
-    let blockDownloadsPref = document.getElementById("browser.safebrowsing.downloads.enabled");
-    let malwareTable = document.getElementById("urlclassifier.malwareTable");
-
-    let blockUnwantedPref = document.getElementById("browser.safebrowsing.downloads.remote.block_potentially_unwanted");
-    let blockUncommonPref = document.getElementById("browser.safebrowsing.downloads.remote.block_uncommon");
-
-    enableSafeBrowsing.addEventListener("command", function() {
-      safeBrowsingPhishingPref.value = enableSafeBrowsing.checked;
-      safeBrowsingMalwarePref.value = enableSafeBrowsing.checked;
-
-      if (enableSafeBrowsing.checked) {
-        blockDownloads.removeAttribute("disabled");
-        if (blockDownloads.checked) {
-          blockUncommonUnwanted.removeAttribute("disabled");
-        }
-      } else {
-        blockDownloads.setAttribute("disabled", "true");
-        blockUncommonUnwanted.setAttribute("disabled", "true");
-      }
-    });
-
-    blockDownloads.addEventListener("command", function() {
-      blockDownloadsPref.value = blockDownloads.checked;
-      if (blockDownloads.checked) {
-        blockUncommonUnwanted.removeAttribute("disabled");
-      } else {
-        blockUncommonUnwanted.setAttribute("disabled", "true");
-      }
-    });
-
-    blockUncommonUnwanted.addEventListener("command", function() {
-      blockUnwantedPref.value = blockUncommonUnwanted.checked;
-      blockUncommonPref.value = blockUncommonUnwanted.checked;
-
-      let malware = malwareTable.value
-        .split(",")
-        .filter(x => x !== "goog-unwanted-shavar" && x !== "test-unwanted-simple");
-
-      if (blockUncommonUnwanted.checked) {
-        malware.push("goog-unwanted-shavar");
-        malware.push("test-unwanted-simple");
-      }
-
-      // sort alphabetically to keep the pref consistent
-      malware.sort();
-
-      malwareTable.value = malware.join(",");
-    });
-
-    // set initial values
-
-    enableSafeBrowsing.checked = safeBrowsingPhishingPref.value && safeBrowsingMalwarePref.value;
-    if (!enableSafeBrowsing.checked) {
-      blockDownloads.setAttribute("disabled", "true");
-      blockUncommonUnwanted.setAttribute("disabled", "true");
-    }
-
-    blockDownloads.checked = blockDownloadsPref.value;
-    if (!blockDownloadsPref.value) {
-      blockUncommonUnwanted.setAttribute("disabled", "true");
-    }
-
-    blockUncommonUnwanted.checked = blockUnwantedPref.value && blockUncommonPref.value;
-  },
-#endif
-
   /**
    * Enables/disables the master password button depending on the state of the
    * "use master password" checkbox, and prompts for master password removal if
diff --git a/application/basilisk/components/preferences/in-content/security.xul b/application/basilisk/components/preferences/in-content/security.xul
index 33e1471bd5..fca84f7144 100644
--- a/application/basilisk/components/preferences/in-content/security.xul
+++ b/application/basilisk/components/preferences/in-content/security.xul
@@ -21,31 +21,6 @@
               name="xpinstall.whitelist.required"
               type="bool"/>
 
-#ifdef MOZ_SAFE_BROWSING
-  <!-- Malware, phishing -->
-  <preference id="browser.safebrowsing.malware.enabled"
-              name="browser.safebrowsing.malware.enabled"
-              type="bool"/>
-  <preference id="browser.safebrowsing.phishing.enabled"
-              name="browser.safebrowsing.phishing.enabled"
-              type="bool"/>
-
-  <preference id="browser.safebrowsing.downloads.enabled"
-              name="browser.safebrowsing.downloads.enabled"
-              type="bool"/>
-
-  <preference id="urlclassifier.malwareTable"
-              name="urlclassifier.malwareTable"
-              type="string"/>
-
-  <preference id="browser.safebrowsing.downloads.remote.block_potentially_unwanted"
-              name="browser.safebrowsing.downloads.remote.block_potentially_unwanted"
-              type="bool"/>
-  <preference id="browser.safebrowsing.downloads.remote.block_uncommon"
-              name="browser.safebrowsing.downloads.remote.block_uncommon"
-              type="bool"/>
-#endif
-
   <!-- Passwords -->
   <preference id="signon.rememberSignons" name="signon.rememberSignons" type="bool"/>
   <preference id="signon.autofillForms"   name="signon.autofillForms"   type="bool"/>
@@ -76,23 +51,6 @@
             accesskey="&addonExceptions.accesskey;"/>
   </hbox>
 
-#ifdef MOZ_SAFE_BROWSING
-<!-- Safebrowsing (phishing) UI -->
-  <separator class="thin"/>
-  <vbox align="start">
-    <checkbox id="enableSafeBrowsing"
-              label="&enableSafeBrowsing.label;"
-              accesskey="&enableSafeBrowsing.accesskey;" />
-    <vbox class="indent">
-      <checkbox id="blockDownloads"
-                label="&blockDownloads.label;"
-                accesskey="&blockDownloads.accesskey;" />
-      <checkbox id="blockUncommonUnwanted"
-                label="&blockUncommonUnwanted.label;"
-                accesskey="&blockUncommonUnwanted.accesskey;" />
-    </vbox>
-  </vbox>
-#endif
 </groupbox>
 
 <!-- Passwords -->
diff --git a/application/basilisk/components/preferences/jar.mn b/application/basilisk/components/preferences/jar.mn
index f74be08205..50aa0fab91 100644
--- a/application/basilisk/components/preferences/jar.mn
+++ b/application/basilisk/components/preferences/jar.mn
@@ -5,18 +5,11 @@
 browser.jar:
     content/browser/preferences/applicationManager.xul
     content/browser/preferences/applicationManager.js
-#ifdef MOZ_SAFE_BROWSING
-    content/browser/preferences/blocklists.xul
-    content/browser/preferences/blocklists.js
-#endif
 *   content/browser/preferences/colors.xul
 *   content/browser/preferences/cookies.xul
     content/browser/preferences/cookies.js
 *   content/browser/preferences/connection.xul
     content/browser/preferences/connection.js
-#ifdef MOZ_SAFE_BROWSING
-    content/browser/preferences/donottrack.xul
-#endif
 *   content/browser/preferences/fonts.xul
     content/browser/preferences/fonts.js
     content/browser/preferences/handlers.xml
diff --git a/application/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.js b/application/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.js
index 00184102a5..28b3398a20 100644
--- a/application/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.js
+++ b/application/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.js
@@ -14,32 +14,6 @@ const FAVICON_PRIVACY = "chrome://browser/skin/privatebrowsing/favicon.svg";
 var stringBundle = Services.strings.createBundle(
                     "chrome://browser/locale/aboutPrivateBrowsing.properties");
 
-#ifdef MOZ_SAFE_BROWSING
-var prefBranch = Services.prefs.getBranch("privacy.trackingprotection.");
-var prefObserver = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
-                                        Ci.nsISupportsWeakReference]),
- observe: function () {
-   let tpSubHeader = document.getElementById("tpSubHeader");
-   let tpToggle = document.getElementById("tpToggle");
-   let tpButton = document.getElementById("tpButton");
-   let title = document.getElementById("title");
-   let titleTracking = document.getElementById("titleTracking");
-   let globalTrackingEnabled = prefBranch.getBoolPref("enabled");
-   let trackingEnabled = globalTrackingEnabled ||
-                         prefBranch.getBoolPref("pbmode.enabled");
-
-   tpButton.classList.toggle("hide", globalTrackingEnabled);
-   tpToggle.checked = trackingEnabled;
-   title.classList.toggle("hide", trackingEnabled);
-   titleTracking.classList.toggle("hide", !trackingEnabled);
-   tpSubHeader.classList.toggle("tp-off", !trackingEnabled);
- }
-};
-prefBranch.addObserver("pbmode.enabled", prefObserver, true);
-prefBranch.addObserver("enabled", prefObserver, true);
-#endif
-
 function setFavIcon(url) {
  document.getElementById("favicon").setAttribute("href", url);
 }
@@ -56,29 +30,15 @@ document.addEventListener("DOMContentLoaded", function () {
    return;
  }
 
-#ifdef MOZ_SAFE_BROWSING
- let tpToggle = document.getElementById("tpToggle");
- document.getElementById("tpButton").addEventListener('click', () => {
-   tpToggle.click();
- });
-#endif
-
  document.title = stringBundle.GetStringFromName("title.head");
  document.getElementById("favicon")
          .setAttribute("href", FAVICON_PRIVACY);
-#ifdef MOZ_SAFE_BROWSING
- tpToggle.addEventListener("change", toggleTrackingProtection);
-#endif
 
  let formatURLPref = Cc["@mozilla.org/toolkit/URLFormatterService;1"]
                        .getService(Ci.nsIURLFormatter).formatURLPref;
  document.getElementById("learnMore").setAttribute("href",
                     formatURLPref("app.support.baseURL") + "private-browsing");
 
-#ifdef MOZ_SAFE_BROWSING
- // Update state that depends on preferences.
- prefObserver.observe();
-#endif
 }, false);
 
 function openPrivateWindow() {
@@ -87,11 +47,3 @@ function openPrivateWindow() {
    new CustomEvent("AboutPrivateBrowsingOpenWindow", {bubbles:true}));
 }
 
-#ifdef MOZ_SAFE_BROWSING
-function toggleTrackingProtection() {
- // Ask chrome to enable tracking protection
- document.dispatchEvent(
-   new CustomEvent("AboutPrivateBrowsingToggleTrackingProtection",
-                   {bubbles: true}));
-}
-#endif
diff --git a/application/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml b/application/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
index c27de69945..9e2f52e8d5 100644
--- a/application/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
+++ b/application/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
@@ -35,9 +35,6 @@
     <div class="showPrivate about-content-container">
       <h1 class="title">
         <span id="title">&privateBrowsing.title;</span>
-#ifdef MOZ_SAFE_BROWSING
-        <span id="titleTracking">&privateBrowsing.title.tracking;</span>
-#endif
       </h1>
       <section class="section-main">
         <p>&aboutPrivateBrowsing.info.notsaved.before;<strong>&aboutPrivateBrowsing.info.notsaved.emphasize;</strong>&aboutPrivateBrowsing.info.notsaved.after;</p>
@@ -63,18 +60,6 @@
         </p>
       </section>
 
-#ifdef MOZ_SAFE_BROWSING
-      <h2 id="tpSubHeader" class="about-subheader">
-        <span class="tpTitle">&trackingProtection.title;</span>
-        <input id="tpToggle" class="toggle toggle-input" type="checkbox"/>
-        <span id="tpButton" class="toggle-btn"></span>
-      </h2>
-
-      <section class="section-main">
-        <p>&trackingProtection.description2;</p>
-      </section>
-#endif
-
       <section class="section-main">
         <p class="about-info">&aboutPrivateBrowsing.learnMore2;
           <a id="learnMore" target="_blank">&aboutPrivateBrowsing.learnMore2.title;</a>.
diff --git a/application/basilisk/confvars.sh b/application/basilisk/confvars.sh
index 7175957f73..7fcbb1a703 100644
--- a/application/basilisk/confvars.sh
+++ b/application/basilisk/confvars.sh
@@ -57,7 +57,6 @@ MOZ_DEVTOOLS=1
 MOZ_SERVICES_COMMON=1
 MOZ_SERVICES_SYNC=1
 MOZ_SERVICES_HEALTHREPORT=
-MOZ_SAFE_BROWSING=
 MOZ_GAMEPAD=1
 MOZ_AV1=1
 
diff --git a/application/basilisk/installer/package-manifest.in b/application/basilisk/installer/package-manifest.in
index 4b45591d85..df7808ce47 100644
--- a/application/basilisk/installer/package-manifest.in
+++ b/application/basilisk/installer/package-manifest.in
@@ -554,19 +554,9 @@
 @RESPATH@/browser/modules/*
 @RESPATH@/modules/*
 
-#ifdef MOZ_URL_CLASSIFIER
-; Safe Browsing
-@RESPATH@/components/nsURLClassifier.manifest
-@RESPATH@/components/nsUrlClassifierHashCompleter.js
-@RESPATH@/components/nsUrlClassifierListManager.js
-@RESPATH@/components/nsUrlClassifierLib.js
-@RESPATH@/components/url-classifier.xpt
-#endif
-
 ; Private Browsing
 @RESPATH@/components/privatebrowsing.xpt
 @RESPATH@/components/PrivateBrowsing.manifest
-@RESPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
 
 ; ANGLE GLES-on-D3D rendering library
 #ifdef MOZ_ANGLE_RENDERER
diff --git a/application/basilisk/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd b/application/basilisk/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd
index ccb0d297f4..bcf9189f27 100644
--- a/application/basilisk/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd
@@ -25,7 +25,3 @@
 <!ENTITY aboutPrivateBrowsing.note.after                 " on the Internet. Your employer or Internet service provider can still know what page you visit.">
 <!ENTITY aboutPrivateBrowsing.learnMore2                 "Learn more about">
 <!ENTITY aboutPrivateBrowsing.learnMore2.title           "Private Browsing">
-
-<!ENTITY trackingProtection.title                        "Tracking Protection">
-<!ENTITY trackingProtection.description2                 "Some websites use trackers that can monitor your activity across the Internet. With Tracking Protection &brandShortName; will block many trackers that can collect information about your browsing behavior.">
-<!ENTITY trackingProtection.startTour1                   "See how it works">
diff --git a/application/basilisk/locales/en-US/chrome/browser/browser.dtd b/application/basilisk/locales/en-US/chrome/browser/browser.dtd
index 044fd303b7..e6517603fb 100644
--- a/application/basilisk/locales/en-US/chrome/browser/browser.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/browser.dtd
@@ -726,33 +726,6 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!ENTITY getUserMedia.audioCapture.label "Audio from the tab will be shared.">
 <!ENTITY getUserMedia.allWindowsShared.message "All visible windows on your screen will be shared.">
 
-<!ENTITY trackingProtection.title "Tracking Protection">
-<!ENTITY trackingProtection.detectedBlocked3 "&brandShortName; is blocking parts of the page that may track your browsing.">
-<!ENTITY trackingProtection.detectedNotBlocked3 "This site includes elements that may track your browsing. You have disabled protection.">
-<!ENTITY trackingProtection.notDetected3 "No tracking elements detected on this page.">
-<!-- LOCALIZATION NOTE (trackingProtection.unblock.label, trackingProtection.unblock.accesskey):
-     The associated button with this label and accesskey is only shown when opening the control
-     center while looking at a site with trackers in NON-private browsing mode. -->
-<!ENTITY trackingProtection.unblock.label "Disable protection for this site">
-<!ENTITY trackingProtection.unblock.accesskey "D">
-<!-- LOCALIZATION NOTE (trackingProtection.unblockPrivate.label, trackingProtection.unblockPrivate.accesskey):
-     The associated button with this label and accesskey is only shown when opening the control
-     center while looking at a site with trackers in PRIVATE browsing mode. -->
-<!ENTITY trackingProtection.unblockPrivate.label "Disable protection for this session">
-<!ENTITY trackingProtection.unblockPrivate.accesskey "D">
-<!ENTITY trackingProtection.block2.label "Enable protection">
-<!ENTITY trackingProtection.block2.accesskey "E">
-
-<!ENTITY trackingContentBlocked.message "Tracking">
-<!ENTITY trackingContentBlocked.moreinfo "Parts of the page that track your online activity have been blocked.">
-<!ENTITY trackingContentBlocked.learnMore "Learn More">
-<!ENTITY trackingContentBlocked.options "Options">
-<!ENTITY trackingContentBlocked.unblock2.label "Disable protection for this site">
-<!ENTITY trackingContentBlocked.unblock2.accesskey "D">
-<!ENTITY trackingContentBlocked.block.label "Enable protection">
-<!ENTITY trackingContentBlocked.block.accesskey "E">
-<!ENTITY trackingContentBlocked.disabled.message "Tracking protection is disabled">
-
 <!ENTITY pluginNotification.showAll.label "Show All">
 <!ENTITY pluginNotification.showAll.accesskey "S">
 
diff --git a/application/basilisk/locales/en-US/chrome/browser/browser.properties b/application/basilisk/locales/en-US/chrome/browser/browser.properties
index 28e8bea23d..432cecda66 100644
--- a/application/basilisk/locales/en-US/chrome/browser/browser.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/browser.properties
@@ -332,9 +332,6 @@ identity.identified.state_and_country=%S, %S
 
 identity.icon.tooltip=Show site information
 
-trackingProtection.icon.activeTooltip=Tracking attempts blocked
-trackingProtection.icon.disabledTooltip=Tracking content detected
-
 # Edit Bookmark UI
 editBookmarkPanel.pageBookmarkedTitle=Page Bookmarked
 editBookmarkPanel.pageBookmarkedDescription=%S will always remember this page for you.
diff --git a/application/basilisk/locales/en-US/chrome/browser/preferences/donottrack.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/donottrack.dtd
deleted file mode 100644
index 781fb53cd5..0000000000
--- a/application/basilisk/locales/en-US/chrome/browser/preferences/donottrack.dtd
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY window.title                 "Do Not Track">
-<!ENTITY window.width                 "50em">
-<!ENTITY window.height                "10em">
-
-<!ENTITY doNotTrackCheckbox2.label    "Always apply Do Not Track">
-<!ENTITY doNotTrackCheckbox2.accesskey "A">
-
-<!ENTITY doNotTrackTPInfo.description "&brandShortName; will send a signal that you don’t want to be tracked whenever Tracking Protection is on.">
-<!ENTITY doNotTrackLearnMore.label    "Learn More">
diff --git a/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties b/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties
index c0b7e1be01..8ebb867f93 100644
--- a/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties
@@ -19,8 +19,6 @@ acceptVeryLargeMinimumFont=Keep my changes anyway
 
 #### Permissions Manager
 
-trackingprotectionpermissionstext=You have disabled Tracking Protection on these sites.
-trackingprotectionpermissionstitle=Exceptions - Tracking Protection
 cookiepermissionstext=You can specify which websites are always or never allowed to store cookies and site data. Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
 cookiepermissionstitle=Exceptions - Cookies and Site Data
 addonspermissionstext=You can specify which websites are allowed to install add-ons. Type the exact address of the site you want to allow and then click Allow.
diff --git a/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd
index 8820e92abf..e9f3984484 100644
--- a/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd
@@ -3,34 +3,9 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY tracking.label                 "Tracking">
-#ifdef MOZ_SAFE_BROWSING
-<!ENTITY  trackingProtectionHeader.label       "Use Tracking Protection">
-<!ENTITY  trackingProtectionAlways.label       "Always">
-<!ENTITY  trackingProtectionAlways.accesskey   "y">
-<!ENTITY  trackingProtectionPrivate.label      "Only in private windows">
-<!ENTITY  trackingProtectionPrivate.accesskey  "l">
-<!ENTITY  trackingProtectionNever.label        "Never">
-<!ENTITY  trackingProtectionNever.accesskey    "n">
-<!ENTITY  trackingProtectionLearnMore.label    "Learn more">
-<!ENTITY  trackingProtectionExceptions.label   "Exceptions…">
-<!ENTITY  trackingProtectionExceptions.accesskey "x">
-
-<!ENTITY trackingProtectionPBM5.label         "Use Tracking Protection in Private Windows">
-<!ENTITY trackingProtectionPBM5.accesskey     "v">
-<!ENTITY trackingProtectionPBMLearnMore.label "Learn more">
-<!ENTITY changeBlockList.label          "Change Block List">
-<!ENTITY changeBlockList.accesskey      "C">
-
-<!-- LOCALIZATION NOTE (doNotTrack.pre.label): include a trailing space as needed -->
-<!-- LOCALIZATION NOTE (doNotTrack.post.label): include a starting space as needed -->
-<!ENTITY  doNotTrack.pre.label          "You can also ">
-<!ENTITY  doNotTrack.settings.label     "manage your Do Not Track settings">
-<!ENTITY  doNotTrack.post.label         ".">
-#else
 <!ENTITY doNotTrack.label               "Send a signal that you don’t want to be tracked">
 <!ENTITY doNotTrack.accesskey           "T">
 <!ENTITY doNotTrackLearnMore.label      "Learn More">
-#endif
 
 <!ENTITY  history.label                 "History">
 
diff --git a/application/basilisk/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd b/application/basilisk/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
deleted file mode 100644
index 33d2202b32..0000000000
--- a/application/basilisk/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY safeb.palm.accept.label "Get me out of here!">
-<!ENTITY safeb.palm.decline.label "Ignore this warning">
-<!-- Localization note (safeb.palm.notdeceptive.label) - Label of the Help menu
-  item. Either this or reportDeceptiveSiteMenu.label from report-phishing.dtd is
-  shown. -->
-<!ENTITY safeb.palm.notdeceptive.label "This isn’t a deceptive site…">
-<!-- Localization note (safeb.palm.notdeceptive.accesskey) - Because
-  safeb.palm.notdeceptive.label and reportDeceptiveSiteMenu.title from
-  report-phishing.dtd are never shown at the same time, the same accesskey can
-  be used for them. -->
-<!ENTITY safeb.palm.notdeceptive.accesskey "d">
-<!ENTITY safeb.palm.reportPage.label "Why was this page blocked?">
-
-<!ENTITY safeb.blocked.malwarePage.title "Reported Attack Page!">
-<!-- Localization note (safeb.blocked.malwarePage.shortDesc) - Please don't translate the contents of the <span id="malware_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
-<!ENTITY safeb.blocked.malwarePage.shortDesc "This web page at <span id='malware_sitename'/> has been reported as an attack page and has been blocked based on your security preferences.">
-<!ENTITY safeb.blocked.malwarePage.longDesc "<p>Attack pages try to install programs that steal private information, use your computer to attack others, or damage your system.</p><p>Some attack pages intentionally distribute harmful software, but many are compromised without the knowledge or permission of their owners.</p>">
-
-<!ENTITY safeb.blocked.unwantedPage.title "Reported Unwanted Software Page!">
-<!-- Localization note (safeb.blocked.unwantedPage.shortDesc) - Please don't translate the contents of the <span id="unwanted_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
-<!ENTITY safeb.blocked.unwantedPage.shortDesc "This web page at <span id='unwanted_sitename'/> has been reported to contain unwanted software and has been blocked based on your security preferences.">
-<!ENTITY safeb.blocked.unwantedPage.longDesc "<p>Unwanted software pages try to install software that can be deceptive and affect your system in unexpected ways.</p>">
-
-<!ENTITY safeb.blocked.phishingPage.title2 "Deceptive Site!">
-<!-- Localization note (safeb.blocked.phishingPage.shortDesc2) - Please don't translate the contents of the <span id="phishing_sitename"/> tag. It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
-<!ENTITY safeb.blocked.phishingPage.shortDesc2 "This web page at <span id='phishing_sitename'/> has been reported as a deceptive site and has been blocked based on your security preferences.">
-<!ENTITY safeb.blocked.phishingPage.longDesc2 "<p>Deceptive sites are designed to trick you into doing something dangerous, like installing software, or revealing your personal information, like passwords, phone numbers or credit cards.</p><p>Entering any information on this web page may result in identity theft or other fraud.</p>">
-
diff --git a/application/basilisk/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd b/application/basilisk/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd
deleted file mode 100644
index 7444bcbf37..0000000000
--- a/application/basilisk/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!-- Localization note (reportDeceptiveSiteMenu.title) - Label of the Help menu
-  item. Either this or safeb.palm.notdeceptive.label from
-  phishing-afterload-warning-message.dtd is shown. -->
-<!ENTITY reportDeceptiveSiteMenu.title      "Report deceptive site…">
-<!-- Localization note (reportDeceptiveSiteMenu.accesskey) - Because
-  safeb.palm.notdeceptive.label from phishing-afterload-warning-message.dtd and
-  reportDeceptiveSiteMenu.title are never shown at the same time, the same
-  accesskey can be used for them. -->
-<!ENTITY reportDeceptiveSiteMenu.accesskey  "D">
diff --git a/application/basilisk/locales/jar.mn b/application/basilisk/locales/jar.mn
index ae6f11cc63..16e8a5fee7 100644
--- a/application/basilisk/locales/jar.mn
+++ b/application/basilisk/locales/jar.mn
@@ -48,10 +48,6 @@
     locale/browser/places/bookmarkProperties.properties (%chrome/browser/places/bookmarkProperties.properties)
     locale/browser/preferences/selectBookmark.dtd  (%chrome/browser/preferences/selectBookmark.dtd)
     locale/browser/places/moveBookmarks.dtd        (%chrome/browser/places/moveBookmarks.dtd)
-#ifdef MOZ_SAFE_BROWSING
-    locale/browser/safebrowsing/phishing-afterload-warning-message.dtd (%chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd)
-    locale/browser/safebrowsing/report-phishing.dtd                    (%chrome/browser/safebrowsing/report-phishing.dtd)
-#endif
     locale/browser/feeds/subscribe.dtd              (%chrome/browser/feeds/subscribe.dtd)
     locale/browser/feeds/subscribe.properties       (%chrome/browser/feeds/subscribe.properties)
     locale/browser/migration/migration.dtd         (%chrome/browser/migration/migration.dtd)
@@ -59,16 +55,10 @@
     locale/browser/preferences/advanced.dtd           (%chrome/browser/preferences/advanced.dtd)
     locale/browser/preferences/applicationManager.dtd        (%chrome/browser/preferences/applicationManager.dtd)
     locale/browser/preferences/applicationManager.properties (%chrome/browser/preferences/applicationManager.properties)
-#ifdef MOZ_SAFE_BROWSING
-    locale/browser/preferences/blocklists.dtd         (%chrome/browser/preferences/blocklists.dtd)
-#endif
     locale/browser/preferences/colors.dtd             (%chrome/browser/preferences/colors.dtd)
     locale/browser/preferences/cookies.dtd            (%chrome/browser/preferences/cookies.dtd)
     locale/browser/preferences/content.dtd            (%chrome/browser/preferences/content.dtd)
     locale/browser/preferences/connection.dtd         (%chrome/browser/preferences/connection.dtd)
-#ifdef MOZ_SAFE_BROWSING
-    locale/browser/preferences/donottrack.dtd         (%chrome/browser/preferences/donottrack.dtd)
-#endif
     locale/browser/preferences/applications.dtd       (%chrome/browser/preferences/applications.dtd)
     locale/browser/preferences/fonts.dtd              (%chrome/browser/preferences/fonts.dtd)
     locale/browser/preferences/main.dtd               (%chrome/browser/preferences/main.dtd)
diff --git a/application/basilisk/themes/shared/incontentprefs/preferences.inc.css b/application/basilisk/themes/shared/incontentprefs/preferences.inc.css
index 1b7af33bdc..980d689ac3 100644
--- a/application/basilisk/themes/shared/incontentprefs/preferences.inc.css
+++ b/application/basilisk/themes/shared/incontentprefs/preferences.inc.css
@@ -236,13 +236,6 @@ treecol {
 
 /* Privacy pane */
 
-#trackingProtectionPBMLearnMore,
-#trackingProtectionLearnMore {
-  margin-inline-start: 1.5em !important;
-  margin-top: 0;
-  font-weight: normal;
-}
-
 .doNotTrackLearnMore {
   margin-inline-start: calc(1em + 30px);
   margin-bottom: 1em;
diff --git a/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
index 1201ed6923..e9c98ae369 100644
--- a/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
+++ b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
@@ -183,40 +183,6 @@ this.ControlCenter = {
       }),
     },
 
-    trackingProtectionNoElements: {
-      applyConfig: Task.async(function* () {
-        Services.prefs.setBoolPref("privacy.trackingprotection.enabled", true);
-
-        yield loadPage(HTTP_PAGE);
-        yield openIdentityPopup();
-      }),
-    },
-
-    trackingProtectionEnabled: {
-      applyConfig: Task.async(function* () {
-        Services.prefs.setBoolPref("privacy.trackingprotection.enabled", true);
-        yield UrlClassifierTestUtils.addTestTrackers();
-
-        yield loadPage(TRACKING_PAGE);
-        yield openIdentityPopup();
-      }),
-    },
-
-    trackingProtectionDisabled: {
-      applyConfig: Task.async(function* () {
-        let browserWindow = Services.wm.getMostRecentWindow("navigator:browser");
-        let gBrowser = browserWindow.gBrowser;
-        Services.prefs.setBoolPref("privacy.trackingprotection.enabled", true);
-        yield UrlClassifierTestUtils.addTestTrackers();
-
-        yield loadPage(TRACKING_PAGE);
-        yield openIdentityPopup();
-        // unblock the page
-        gBrowser.ownerGlobal.document.querySelector("#tracking-action-unblock").click();
-        yield BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, false, TRACKING_PAGE);
-        yield openIdentityPopup();
-      }),
-    },
   },
 };