From 547396f6fdd394a7c0cb4c81d314e3261fc67394 Mon Sep 17 00:00:00 2001
From: Gaming4JC <g4jc@hyperbola.info>
Date: Sat, 17 Jun 2023 09:23:37 -0400
Subject: [PATCH 1/1] Fix for UXP #2133 with adjustments from Basilisk #2

Removes Safebrowsing and TrackingProtection from the FE which was removed in UXP
---
 app/profile/iceweasel-uxp.js                  |   7 -
 base/content/blockedSite.xhtml                | 196 -----------------
 base/content/browser-safebrowsing.js          |  50 -----
 base/content/browser-trackingprotection.js    | 132 -----------
 base/content/browser.js                       |  20 --
 base/content/global-scripts.inc               |   1 -
 base/content/report-phishing-overlay.xul      |  35 ---
 base/content/tab-content.js                   |   5 -
 base/jar.mn                                   |   4 -
 components/about/AboutRedirector.cpp          |   9 -
 .../controlcenter/content/panel.inc.xul       |  31 ---
 components/preferences/blocklists.js          | 206 ------------------
 components/preferences/blocklists.xul         |  56 -----
 components/preferences/donottrack.xul         |  43 ----
 components/preferences/in-content/privacy.js  | 125 -----------
 components/preferences/in-content/privacy.xul |  65 ------
 components/preferences/in-content/security.js |  78 -------
 .../preferences/in-content/security.xul       |  42 ----
 components/preferences/jar.mn                 |   3 -
 .../content/aboutPrivateBrowsing.js           |  40 ----
 .../content/aboutPrivateBrowsing.xhtml        |  11 -
 installer/package-manifest.in                 |   5 -
 .../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    |  24 --
 .../phishing-afterload-warning-message.dtd    |  32 ---
 .../browser/safebrowsing/report-phishing.dtd  |  13 --
 locales/jar.mn                                |   6 -
 .../shared/incontentprefs/preferences.inc.css |   7 -
 .../configurations/ControlCenter.jsm          |  35 ---
 .../extension/configurations/Preferences.jsm  |   7 -
 34 files changed, 1337 deletions(-)
 delete mode 100644 base/content/blockedSite.xhtml
 delete mode 100644 base/content/browser-safebrowsing.js
 delete mode 100644 base/content/browser-trackingprotection.js
 delete mode 100644 base/content/report-phishing-overlay.xul
 delete mode 100644 components/preferences/blocklists.js
 delete mode 100644 components/preferences/blocklists.xul
 delete mode 100644 components/preferences/donottrack.xul
 delete mode 100644 locales/en-US/chrome/browser/preferences/donottrack.dtd
 delete mode 100644 locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
 delete mode 100644 locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd

diff --git a/app/profile/iceweasel-uxp.js b/app/profile/iceweasel-uxp.js
index f5b75e9..b2c8c34 100644
--- a/app/profile/iceweasel-uxp.js
+++ b/app/profile/iceweasel-uxp.js
@@ -956,7 +956,6 @@ 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);
@@ -1111,12 +1110,6 @@ pref("browser.cache.frecency_experiment", -1);
 // Enable GMP support in the addon manager.
 pref("media.gmp-provider.enabled", false);
 
-#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/base/content/blockedSite.xhtml b/base/content/blockedSite.xhtml
deleted file mode 100644
index 10a4b33..0000000
--- a/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/base/content/browser-safebrowsing.js b/base/content/browser-safebrowsing.js
deleted file mode 100644
index a66595b..0000000
--- a/base/content/browser-safebrowsing.js
+++ /dev/null
@@ -1,50 +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/. */
-
-#ifdef MOZ_SAFE_BROWSING
-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);
-  }
-}
-#endif
diff --git a/base/content/browser-trackingprotection.js b/base/content/browser-trackingprotection.js
deleted file mode 100644
index 426ed70..0000000
--- a/base/content/browser-trackingprotection.js
+++ /dev/null
@@ -1,132 +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 = {
-  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/base/content/browser.js b/base/content/browser.js
index 58a57be..8bcee8b 100755
--- a/base/content/browser.js
+++ b/base/content/browser.js
@@ -49,11 +49,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"],
@@ -947,7 +942,6 @@ var gBrowserInit = {
     BrowserOnClick.init();
     FeedHandler.init();
     AboutPrivateBrowsingListener.init();
-    TrackingProtection.init();
     RefreshBlocker.init();
     CaptivePortalWatcher.init();
 
@@ -1156,11 +1150,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);
@@ -1422,8 +1411,6 @@ var gBrowserInit = {
 
     FeedHandler.uninit();
 
-    TrackingProtection.uninit();
-
     RefreshBlocker.uninit();
 
     CaptivePortalWatcher.uninit();
@@ -4258,7 +4245,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
@@ -7709,12 +7695,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/base/content/global-scripts.inc b/base/content/global-scripts.inc
index e11f4e9..2775dea 100755
--- a/base/content/global-scripts.inc
+++ b/base/content/global-scripts.inc
@@ -24,4 +24,3 @@
 <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"/>
diff --git a/base/content/report-phishing-overlay.xul b/base/content/report-phishing-overlay.xul
deleted file mode 100644
index 712079f..0000000
--- a/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/base/content/tab-content.js b/base/content/tab-content.js
index 2eae5d3..1438b25 100644
--- a/base/content/tab-content.js
+++ b/base/content/tab-content.js
@@ -195,8 +195,6 @@ var AboutPrivateBrowsingListener = {
   init(chromeGlobal) {
     chromeGlobal.addEventListener("AboutPrivateBrowsingOpenWindow", this,
                                   false, true);
-    chromeGlobal.addEventListener("AboutPrivateBrowsingToggleTrackingProtection", this,
-                                  false, true);
   },
 
   get isAboutPrivateBrowsing() {
@@ -211,9 +209,6 @@ var AboutPrivateBrowsingListener = {
       case "AboutPrivateBrowsingOpenWindow":
         sendAsyncMessage("AboutPrivateBrowsing:OpenPrivateWindow");
         break;
-      case "AboutPrivateBrowsingToggleTrackingProtection":
-        sendAsyncMessage("AboutPrivateBrowsing:ToggleTrackingProtection");
-        break;
     }
   },
 };
diff --git a/base/jar.mn b/base/jar.mn
index 03be5bd..509b111 100644
--- a/base/jar.mn
+++ b/base/jar.mn
@@ -72,9 +72,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
@@ -83,7 +80,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/gcli_sec_bad.svg              (content/gcli_sec_bad.svg)
diff --git a/components/about/AboutRedirector.cpp b/components/about/AboutRedirector.cpp
index 8b68282..8e13784 100644
--- a/components/about/AboutRedirector.cpp
+++ b/components/about/AboutRedirector.cpp
@@ -52,15 +52,6 @@ static RedirEntry kRedirMap[] = {
     nsIAboutModule::MAKE_LINKABLE
   },
 /* Iceweasel specific branding end */
-#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/components/controlcenter/content/panel.inc.xul b/components/controlcenter/content/panel.inc.xul
index 361b3c9..7f5793c 100644
--- a/components/controlcenter/content/panel.inc.xul
+++ b/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/components/preferences/blocklists.js b/components/preferences/blocklists.js
deleted file mode 100644
index a806334..0000000
--- a/components/preferences/blocklists.js
+++ /dev/null
@@ -1,206 +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";
-
-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/components/preferences/blocklists.xul b/components/preferences/blocklists.xul
deleted file mode 100644
index 523c208..0000000
--- a/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/components/preferences/donottrack.xul b/components/preferences/donottrack.xul
deleted file mode 100644
index d0631ac..0000000
--- a/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/components/preferences/in-content/privacy.js b/components/preferences/in-content/privacy.js
index fc7857b..16588ca 100644
--- a/components/preferences/in-content/privacy.js
+++ b/components/preferences/in-content/privacy.js
@@ -20,35 +20,6 @@ var gPrivacyPane = {
    */
   _shouldPromptForRestart: true,
 
-  /**
-   * 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);
-  },
-
   /**
    * Initialize autocomplete to ensure prefs are in sync.
    */
@@ -74,8 +45,6 @@ var gPrivacyPane = {
     this.updateHistoryModePane();
     this.updatePrivacyMicroControls();
     this.initAutoStartPrivateBrowsingReverter();
-    this._initTrackingProtection();
-    this._initTrackingProtectionPBM();
     this._initAutocomplete();
 
     setEventListener("privacy.sanitize.sanitizeOnShutdown", "change",
@@ -100,10 +69,6 @@ var gPrivacyPane = {
       gPrivacyPane.clearPrivateDataNow(true);
       return false;
     });
-    setEventListener("doNotTrackSettings", "click", function () {
-      gPrivacyPane.showDoNotTrackSettings();
-      return false;
-    });
     setEventListener("privateBrowsingAutoStart", "command",
                      gPrivacyPane.updateAutostart);
     setEventListener("cookieExceptions", "command",
@@ -112,58 +77,6 @@ var gPrivacyPane = {
                      gPrivacyPane.showCookies);
     setEventListener("clearDataSettings", "command",
                      gPrivacyPane.showClearPrivateDataSettings);
-    setEventListener("trackingProtectionRadioGroup", "command",
-                     gPrivacyPane.trackingProtectionWritePrefs);
-    setEventListener("trackingProtectionExceptions", "command",
-                     gPrivacyPane.showTrackingProtectionExceptions);
-    setEventListener("changeBlockList", "command",
-                     gPrivacyPane.showBlockLists);
-    setEventListener("changeBlockListPBM", "command",
-                     gPrivacyPane.showBlockLists);
-  },
-
-  // 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;
-    }
   },
 
   // HISTORY MODE
@@ -402,44 +315,6 @@ var gPrivacyPane = {
       this._shouldPromptForRestart = true;
   },
 
-  /**
-   * 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);
-  },
-
-  /**
-   * 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");
-  },
-
   // HISTORY
 
   /*
diff --git a/components/preferences/in-content/privacy.xul b/components/preferences/in-content/privacy.xul
index 5efd79a..a08b26d 100644
--- a/components/preferences/in-content/privacy.xul
+++ b/components/preferences/in-content/privacy.xul
@@ -9,14 +9,6 @@
 
 <preferences id="privacyPreferences" hidden="true" data-category="panePrivacy">
 
-  <!-- Tracking -->
-  <preference id="privacy.trackingprotection.enabled"
-              name="privacy.trackingprotection.enabled"
-              type="bool"/>
-  <preference id="privacy.trackingprotection.pbmode.enabled"
-              name="privacy.trackingprotection.pbmode.enabled"
-              type="bool"/>
-
   <!-- XXX button prefs -->
   <preference id="pref.privacy.disable_button.cookie_exceptions"
               name="pref.privacy.disable_button.cookie_exceptions"
@@ -83,63 +75,6 @@
   <html:a class="help-button" target="_blank" aria-label="&helpButton.label;"></html:a>
 </hbox>
 
-<!-- Tracking -->
-<groupbox id="trackingGroup" data-category="panePrivacy" hidden="true">
-  <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>
-</groupbox>
-
 <!-- History -->
 <groupbox id="historyGroup" data-category="panePrivacy" hidden="true">
   <caption><label>&history.label;</label></caption>
diff --git a/components/preferences/in-content/security.js b/components/preferences/in-content/security.js
index 37a187f..01cf410 100644
--- a/components/preferences/in-content/security.js
+++ b/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/components/preferences/in-content/security.xul b/components/preferences/in-content/security.xul
index 33e1471..fca84f7 100644
--- a/components/preferences/in-content/security.xul
+++ b/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/components/preferences/jar.mn b/components/preferences/jar.mn
index e23e189..50aa0fa 100644
--- a/components/preferences/jar.mn
+++ b/components/preferences/jar.mn
@@ -5,14 +5,11 @@
 browser.jar:
     content/browser/preferences/applicationManager.xul
     content/browser/preferences/applicationManager.js
-    content/browser/preferences/blocklists.xul
-    content/browser/preferences/blocklists.js
 *   content/browser/preferences/colors.xul
 *   content/browser/preferences/cookies.xul
     content/browser/preferences/cookies.js
 *   content/browser/preferences/connection.xul
     content/browser/preferences/connection.js
-    content/browser/preferences/donottrack.xul
 *   content/browser/preferences/fonts.xul
     content/browser/preferences/fonts.js
     content/browser/preferences/handlers.xml
diff --git a/components/privatebrowsing/content/aboutPrivateBrowsing.js b/components/privatebrowsing/content/aboutPrivateBrowsing.js
index 055bf68..779c921 100644
--- a/components/privatebrowsing/content/aboutPrivateBrowsing.js
+++ b/components/privatebrowsing/content/aboutPrivateBrowsing.js
@@ -14,30 +14,6 @@ const FAVICON_PRIVACY = "chrome://browser/skin/privatebrowsing/favicon.svg";
 var stringBundle = Services.strings.createBundle(
                     "chrome://browser/locale/aboutPrivateBrowsing.properties");
 
-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);
-
 function setFavIcon(url) {
  document.getElementById("favicon").setAttribute("href", url);
 }
@@ -54,21 +30,12 @@ document.addEventListener("DOMContentLoaded", function () {
    return;
  }
 
- let tpToggle = document.getElementById("tpToggle");
- document.getElementById("tpButton").addEventListener('click', () => {
-   tpToggle.click();
- });
-
  document.title = stringBundle.GetStringFromName("title.head");
  document.getElementById("favicon")
          .setAttribute("href", FAVICON_PRIVACY);
- tpToggle.addEventListener("change", toggleTrackingProtection);
 
  let formatURLPref = Cc["@mozilla.org/toolkit/URLFormatterService;1"]
                        .getService(Ci.nsIURLFormatter).formatURLPref;
-
- // Update state that depends on preferences.
- prefObserver.observe();
 }, false);
 
 function openPrivateWindow() {
@@ -76,10 +43,3 @@ function openPrivateWindow() {
  document.dispatchEvent(
    new CustomEvent("AboutPrivateBrowsingOpenWindow", {bubbles:true}));
 }
-
-function toggleTrackingProtection() {
- // Ask chrome to enable tracking protection
- document.dispatchEvent(
-   new CustomEvent("AboutPrivateBrowsingToggleTrackingProtection",
-                   {bubbles: true}));
-}
\ No newline at end of file
diff --git a/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml b/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
index 9ef5009..0da7e68 100644
--- a/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
+++ b/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
@@ -35,7 +35,6 @@
     <div class="showPrivate about-content-container">
       <h1 class="title">
         <span id="title">&privateBrowsing.title;</span>
-        <span id="titleTracking">&privateBrowsing.title.tracking;</span>
       </h1>
       <section class="section-main">
         <p>&aboutPrivateBrowsing.info.notsaved.before;<strong>&aboutPrivateBrowsing.info.notsaved.emphasize;</strong>&aboutPrivateBrowsing.info.notsaved.after;</p>
@@ -61,16 +60,6 @@
         </p>
       </section>
 
-      <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>
-
     </div>
   </body>
 </html>
diff --git a/installer/package-manifest.in b/installer/package-manifest.in
index 5c35310..bce576f 100644
--- a/installer/package-manifest.in
+++ b/installer/package-manifest.in
@@ -500,11 +500,6 @@
 @RESPATH@/browser/modules/*
 @RESPATH@/modules/*
 
-; Private Browsing
-@RESPATH@/components/privatebrowsing.xpt
-@RESPATH@/components/PrivateBrowsing.manifest
-@RESPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
-
 ; ANGLE GLES-on-D3D rendering library
 #ifdef MOZ_ANGLE_RENDERER
 @BINPATH@/libEGL.dll
diff --git a/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd b/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd
index 5c89478..05591ca 100644
--- a/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd
@@ -7,7 +7,6 @@
 <!ENTITY privatebrowsingpage.openPrivateWindow.accesskey "P">
 
 <!ENTITY privateBrowsing.title                           "Private Browsing">
-<!ENTITY privateBrowsing.title.tracking                  "Private Browsing with Tracking Protection">
 <!ENTITY aboutPrivateBrowsing.info.notsaved.before       "When you browse in a Private Window, Iceweasel-UXP ">
 <!ENTITY aboutPrivateBrowsing.info.notsaved.emphasize    "does not save">
 <!ENTITY aboutPrivateBrowsing.info.notsaved.after        ":">
@@ -23,6 +22,3 @@
 <!ENTITY aboutPrivateBrowsing.note.before                "Private Browsing ">
 <!ENTITY aboutPrivateBrowsing.note.emphasize             "doesn’t make you anonymous">
 <!ENTITY aboutPrivateBrowsing.note.after                 " on the Internet. Your employer or Internet service provider can still know what page you visit.">
-
-<!ENTITY trackingProtection.title                        "Tracking Protection">
-<!ENTITY trackingProtection.description2                 "Some websites use trackers that can monitor your activity across the Internet. With Tracking Protection Iceweasel-UXP will block many trackers that can collect information about your browsing behavior.">
diff --git a/locales/en-US/chrome/browser/browser.dtd b/locales/en-US/chrome/browser/browser.dtd
index 622ad62..45453d6 100644
--- a/locales/en-US/chrome/browser/browser.dtd
+++ b/locales/en-US/chrome/browser/browser.dtd
@@ -725,33 +725,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/locales/en-US/chrome/browser/browser.properties b/locales/en-US/chrome/browser/browser.properties
index 7605fdf..61f11f1 100644
--- a/locales/en-US/chrome/browser/browser.properties
+++ b/locales/en-US/chrome/browser/browser.properties
@@ -336,9 +336,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/locales/en-US/chrome/browser/preferences/donottrack.dtd b/locales/en-US/chrome/browser/preferences/donottrack.dtd
deleted file mode 100644
index 781fb53..0000000
--- a/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/locales/en-US/chrome/browser/preferences/preferences.properties b/locales/en-US/chrome/browser/preferences/preferences.properties
index 37fd122..25d9fa3 100644
--- a/locales/en-US/chrome/browser/preferences/preferences.properties
+++ b/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 use cookies. Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
 cookiepermissionstitle=Exceptions - Cookies
 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/locales/en-US/chrome/browser/preferences/privacy.dtd b/locales/en-US/chrome/browser/preferences/privacy.dtd
index 11eb25f..d9bdee0 100644
--- a/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/locales/en-US/chrome/browser/preferences/privacy.dtd
@@ -2,30 +2,6 @@
    - 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  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 tracking.label                 "Tracking">
-<!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         ".">
-
 <!ENTITY  history.label                 "History">
 
 <!ENTITY  locationBar.label             "Location Bar">
diff --git a/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd b/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
deleted file mode 100644
index 33d2202..0000000
--- a/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/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd b/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd
deleted file mode 100644
index 7444bcb..0000000
--- a/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/locales/jar.mn b/locales/jar.mn
index 61e7b04..751b61a 100644
--- a/locales/jar.mn
+++ b/locales/jar.mn
@@ -49,10 +49,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)
@@ -60,12 +56,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)
-    locale/browser/preferences/blocklists.dtd         (%chrome/browser/preferences/blocklists.dtd)
     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)
-    locale/browser/preferences/donottrack.dtd         (%chrome/browser/preferences/donottrack.dtd)
     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/themes/shared/incontentprefs/preferences.inc.css b/themes/shared/incontentprefs/preferences.inc.css
index 5b598d7..17df2a3 100644
--- a/themes/shared/incontentprefs/preferences.inc.css
+++ b/themes/shared/incontentprefs/preferences.inc.css
@@ -230,13 +230,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/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm b/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
index 1201ed6..6fe52fb 100644
--- a/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
+++ b/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
@@ -182,41 +182,6 @@ this.ControlCenter = {
         yield openIdentityPopup(true);
       }),
     },
-
-    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();
-      }),
-    },
   },
 };
 
diff --git a/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm b/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
index aa2b3f2..d7127f9 100644
--- a/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
+++ b/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
@@ -22,7 +22,6 @@ this.Preferences = {
       ["paneContent", null],
       ["paneApplications", null],
       ["panePrivacy", null],
-      ["panePrivacy", null, DNTDialog],
       ["panePrivacy", null, clearRecentHistoryDialog],
       ["paneSecurity", null],
       ["paneSync", null],
@@ -96,12 +95,6 @@ function paintPromise(browserWindow) {
   });
 }
 
-function* DNTDialog(aBrowser) {
-  yield ContentTask.spawn(aBrowser, null, function* () {
-    content.document.getElementById("doNotTrackSettings").click();
-  });
-}
-
 function* connectionDialog(aBrowser) {
   yield ContentTask.spawn(aBrowser, null, function* () {
     content.document.getElementById("connectionSettings").click();
-- 
2.39.3