From 5db4923320c45333ee50e3ac7e06c47158c37512 Mon Sep 17 00:00:00 2001
From: Coroiu Cristina <ccoroiu@mozilla.com>
Date: Thu, 8 Aug 2019 22:19:24 +0300
Subject: [PATCH] Backed out changeset 2aee1f1d976c (bug 1566861) for
 browser-chrome failures at
 browser/base/content/test/static/browser_all_files_referenced.js on a CLOSED
 TREE

---
 browser/app/profile/firefox.js                |   5 +-
 browser/components/BrowserGlue.jsm            |  12 --
 .../preferences/in-content/privacy.inc.xul    | 104 ++++++++----------
 .../preferences/in-content/privacy.js         |  56 +---------
 .../tests/browser_contentblocking.js          |  23 +---
 ..._search_subdialogs_within_preferences_2.js |   5 +-
 browser/components/preferences/permissions.js |   4 +-
 .../en-US/browser/preferences/permissions.ftl |   6 +-
 .../en-US/browser/preferences/preferences.ftl |  28 ++---
 .../controlcenter/socialblock-disabled.svg    |   2 +-
 .../controlcenter/tracker-image-disabled.svg  |  14 +--
 .../shared/controlcenter/tracker-image.svg    |   2 +-
 .../themes/shared/incontentprefs/privacy.css  |  11 +-
 13 files changed, 81 insertions(+), 191 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index a9e8d847a333..3962401bd5ec 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1587,9 +1587,6 @@ pref("browser.contentblocking.fingerprinting.preferences.ui.enabled", true);
 //   Cryptomining:
 //     "cm": cryptomining blocking enabled
 //     "-cm": cryptomining blocking disabled
-//   Social Tracking Protection:
-//     "stp": social tracking protection enabled
-//     "-stp": social tracking protection disabled
 //   Cookie behavior:
 //     "cookieBehavior0": cookie behaviour BEHAVIOR_ACCEPT
 //     "cookieBehavior1": cookie behaviour BEHAVIOR_REJECT_FOREIGN
@@ -1598,7 +1595,7 @@ pref("browser.contentblocking.fingerprinting.preferences.ui.enabled", true);
 //     "cookieBehavior4": cookie behaviour BEHAVIOR_REJECT_TRACKER
 //     "cookieBehavior5": cookie behaviour BEHAVIOR_REJECT_TRACKER_AND_PARTITION_FOREIGN
 // One value from each section must be included in the browser.contentblocking.features.strict pref.
-pref("browser.contentblocking.features.strict", "tp,tpPrivate,cookieBehavior4,cm,fp,stp");
+pref("browser.contentblocking.features.strict", "tp,tpPrivate,cookieBehavior4,cm,fp");
 
 // Hide the "Change Block List" link for trackers/tracking content in the custom
 // Content Blocking/ETP panel. By default, it will not be visible. There is also
diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
index 72d4af430ccb..da0f0ca21375 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -3600,7 +3600,6 @@ var ContentBlockingCategoriesPrefs = {
         "network.cookie.cookieBehavior": null,
         "privacy.trackingprotection.pbmode.enabled": null,
         "privacy.trackingprotection.enabled": null,
-        "privacy.trackingprotection.socialtracking.enabled": null,
         "privacy.trackingprotection.fingerprinting.enabled": null,
         "privacy.trackingprotection.cryptomining.enabled": null,
       },
@@ -3608,7 +3607,6 @@ var ContentBlockingCategoriesPrefs = {
         "network.cookie.cookieBehavior": null,
         "privacy.trackingprotection.pbmode.enabled": null,
         "privacy.trackingprotection.enabled": null,
-        "privacy.trackingprotection.socialtracking.enabled": null,
         "privacy.trackingprotection.fingerprinting.enabled": null,
         "privacy.trackingprotection.cryptomining.enabled": null,
       },
@@ -3659,16 +3657,6 @@ var ContentBlockingCategoriesPrefs = {
             "privacy.trackingprotection.cryptomining.enabled"
           ] = false;
           break;
-        case "stp":
-          this.CATEGORY_PREFS[type][
-            "privacy.trackingprotection.socialtracking.enabled"
-          ] = true;
-          break;
-        case "-stp":
-          this.CATEGORY_PREFS[type][
-            "privacy.trackingprotection.socialtracking.enabled"
-          ] = false;
-          break;
         case "cookieBehavior0":
           this.CATEGORY_PREFS[type]["network.cookie.cookieBehavior"] =
             Ci.nsICookieService.BEHAVIOR_ACCEPT;
diff --git a/browser/components/preferences/in-content/privacy.inc.xul b/browser/components/preferences/in-content/privacy.inc.xul
index 0f85da6dd8fc..ae1eca3cd38c 100644
--- a/browser/components/preferences/in-content/privacy.inc.xul
+++ b/browser/components/preferences/in-content/privacy.inc.xul
@@ -17,7 +17,7 @@
 
 <!-- Tracking / Content Blocking -->
 <groupbox id="trackingGroup" data-category="panePrivacy" hidden="true" aria-describedby="contentBlockingDescription">
-  <label id="contentBlockingHeader"><html:h2 data-l10n-id="content-blocking-enhanced-tracking-protection"/></label>
+  <label id="contentBlockingHeader"><html:h2 data-l10n-id="content-blocking-header"/></label>
   <vbox data-subcategory="trackingprotection">
     <hbox align="start">
       <image id="trackingProtectionShield"/>
@@ -41,8 +41,8 @@
                     permissions-remove-all.label,
                     permissions-button-cancel.label,
                     permissions-button-ok.label,
-                    permissions-exceptions-etp-window.title,
-                    permissions-exceptions-etp-desc,
+                    permissions-exceptions-content-blocking-window.title,
+                    permissions-exceptions-content-blocking-desc,
                   "/>
         </hbox>
       </vbox>
@@ -64,24 +64,16 @@
                       aria-expanded="false"/>
             </hbox>
             <vbox class="indent default-content-blocking-ui">
-              <description data-l10n-id="content-blocking-etp-standard-desc"></description>
+              <description data-l10n-id="content-blocking-standard-desc"></description>
               <vbox class="content-blocking-extra-information">
                 <vbox class="indent">
-                  <hbox class="extra-information-label social-media-option" hidden="true">
-                    <image class="content-blocking-social-media-image"/>
-                    <label data-l10n-id="content-blocking-social-media-trackers"/>
-                  </hbox>
-                  <hbox class="extra-information-label third-party-tracking-cookies-option" hidden="true">
-                    <image class="content-blocking-cookies-image"/>
-                    <label data-l10n-id="content-blocking-cross-site-tracking-cookies"/>
-                  </hbox>
                   <hbox class="extra-information-label pb-trackers-option" hidden="true">
                     <image class="content-blocking-trackers-image"/>
-                    <label data-l10n-id="content-blocking-private-windows"/>
+                    <label data-l10n-id="content-blocking-private-trackers"/>
                   </hbox>
                   <hbox class="extra-information-label trackers-option" hidden="true">
                     <image class="content-blocking-trackers-image"/>
-                    <label data-l10n-id="content-blocking-all-windows-tracking-content"/>
+                    <label data-l10n-id="content-blocking-all-windows-trackers"/>
                   </hbox>
                   <hbox class="extra-information-label all-third-party-cookies-option" hidden="true">
                     <image class="content-blocking-cookies-image"/>
@@ -91,11 +83,14 @@
                     <image class="content-blocking-cookies-image"/>
                     <label data-l10n-id="content-blocking-all-cookies"/>
                   </hbox>
-
                   <hbox class="extra-information-label unvisited-cookies-option" hidden="true">
                     <image class="content-blocking-cookies-image"/>
                     <label data-l10n-id="content-blocking-unvisited-cookies"/>
                   </hbox>
+                  <hbox class="extra-information-label third-party-tracking-cookies-option" hidden="true">
+                    <image class="content-blocking-cookies-image"/>
+                    <label data-l10n-id="content-blocking-third-party-cookies"/>
+                  </hbox>
                   <hbox class="extra-information-label cryptominers-option" hidden="true">
                     <image class="content-blocking-cryptominers-image"/>
                     <label data-l10n-id="content-blocking-cryptominers"/>
@@ -145,24 +140,16 @@
                       aria-expanded="false"/>
             </hbox>
             <vbox class="indent">
-              <label data-l10n-id="content-blocking-etp-strict-desc"></label>
+              <label data-l10n-id="content-blocking-strict-description"></label>
               <vbox class="content-blocking-extra-information">
                 <vbox class="indent">
-                  <hbox class="extra-information-label social-media-option" hidden="true">
-                    <image class="content-blocking-social-media-image"/>
-                    <label data-l10n-id="content-blocking-social-media-trackers"/>
-                  </hbox>
-                  <hbox class="extra-information-label third-party-tracking-cookies-option" hidden="true">
-                    <image class="content-blocking-cookies-image"/>
-                    <label data-l10n-id="content-blocking-cross-site-tracking-cookies"/>
-                  </hbox>
                   <hbox class="extra-information-label pb-trackers-option" hidden="true">
                     <image class="content-blocking-trackers-image"/>
-                    <label data-l10n-id="content-blocking-private-windows"/>
+                    <label data-l10n-id="content-blocking-private-trackers"/>
                   </hbox>
                   <hbox class="extra-information-label trackers-option" hidden="true">
                     <image class="content-blocking-trackers-image"/>
-                    <label data-l10n-id="content-blocking-all-windows-tracking-content"/>
+                    <label data-l10n-id="content-blocking-all-windows-trackers"/>
                   </hbox>
                   <hbox class="extra-information-label all-third-party-cookies-option" hidden="true">
                     <image class="content-blocking-cookies-image"/>
@@ -178,7 +165,7 @@
                   </hbox>
                   <hbox class="extra-information-label third-party-tracking-cookies-option" hidden="true">
                     <image class="content-blocking-cookies-image"/>
-                    <label data-l10n-id="content-blocking-cross-site-tracking-cookies"/>
+                    <label data-l10n-id="content-blocking-third-party-cookies"/>
                   </hbox>
                   <hbox class="extra-information-label cryptominers-option" hidden="true">
                     <image class="content-blocking-cryptominers-image"/>
@@ -220,8 +207,7 @@
                       <label class="content-blocking-warning-title" data-l10n-id="content-blocking-warning-title"/>
                     </hbox>
                     <description class="indent">
-                      <html:span class="tail-with-learn-more" data-l10n-id="content-blocking-etp-warning-description"></html:span>
-                      <label id="" class="learnMore contentBlockWarningLink" data-l10n-id="content-blocking-warning-learn-how" is="text-link"/>
+                      <html:span class="tail-with-learn-more" data-l10n-id="content-blocking-warning-description"></html:span>
                     </description>
                   </vbox>
                 </vbox>
@@ -241,8 +227,34 @@
                     aria-expanded="false"/>
           </hbox>
           <vbox class="indent">
-            <description id="contentBlockingCustomDesc" data-l10n-id="content-blocking-etp-custom-desc"></description>
+            <description id="contentBlockingCustomDesc" data-l10n-id="content-blocking-custom-desc"></description>
             <vbox class="content-blocking-extra-information">
+              <hbox id="contentBlockingTrackingProtectionExtensionContentLabel"
+                    align="center" hidden="true" class="extension-controlled">
+                <description control="contentBlockingDisableTrackingProtectionExtension" flex="1"/>
+                <button id="contentBlockingDisableTrackingProtectionExtension"
+                        is="highlightable-button"
+                        class="extension-controlled-button accessory-button"
+                        data-l10n-id="disable-extension" hidden="true"/>
+              </hbox>
+                <hbox class="custom-option">
+                  <checkbox id="contentBlockingTrackingProtectionCheckbox"
+                            class="content-blocking-checkbox" flex="1"
+                            data-l10n-id="content-blocking-trackers-label"
+                            aria-describedby="contentBlockingCustomDesc"/>
+                  <vbox>
+                    <menulist id="trackingProtectionMenu">
+                      <menupopup>
+                        <menuitem data-l10n-id="content-blocking-option-private" value="private"/>
+                        <menuitem data-l10n-id="content-blocking-tracking-protection-option-all-windows" value="always"/>
+                      </menupopup>
+                    </menulist>
+                  </vbox>
+                </hbox>
+                <label id="changeBlockListLink"
+                       data-l10n-id="content-blocking-tracking-protection-change-block-list"
+                       is="text-link"
+                       search-l10n-ids="blocklist-window.title, blocklist-description, blocklist-button-cancel.label, blocklist-button-ok.label"/>
                 <hbox class="reject-trackers-ui custom-option">
                   <checkbox id="contentBlockingBlockCookiesCheckbox"
                             class="content-blocking-checkbox" flex="1"
@@ -255,7 +267,7 @@
                       <menulist id="blockCookiesMenu"
                                 preference="network.cookie.cookieBehavior">
                         <menupopup>
-                          <menuitem id="blockCookiesSocialMedia" data-l10n-id="sitedata-option-block-cross-site-trackers" value="trackers"/>
+                          <menuitem data-l10n-id="sitedata-option-block-trackers" value="trackers"/>
                           <menuitem data-l10n-id="sitedata-option-block-unvisited" value="unvisited"/>
                           <menuitem data-l10n-id="sitedata-option-block-all-third-party" value="all-third-parties"/>
                           <menuitem data-l10n-id="sitedata-option-block-all" value="always"/>
@@ -264,33 +276,6 @@
                     </hbox>
                   </vbox>
                 </hbox>
-                <hbox id="contentBlockingTrackingProtectionExtensionContentLabel"
-                      align="center" hidden="true" class="extension-controlled">
-                  <description control="contentBlockingDisableTrackingProtectionExtension" flex="1"/>
-                  <button id="contentBlockingDisableTrackingProtectionExtension"
-                          is="highlightable-button"
-                          class="extension-controlled-button accessory-button"
-                          data-l10n-id="disable-extension" hidden="true"/>
-                </hbox>
-                  <hbox class="custom-option">
-                    <checkbox id="contentBlockingTrackingProtectionCheckbox"
-                              class="content-blocking-checkbox" flex="1"
-                              data-l10n-id="content-blocking-tracking-content-label"
-                              aria-describedby="contentBlockingCustomDesc"/>
-                    <vbox>
-                      <menulist id="trackingProtectionMenu">
-                        <menupopup>
-                          <menuitem data-l10n-id="content-blocking-option-private" value="private"/>
-                          <menuitem data-l10n-id="content-blocking-tracking-protection-option-all-windows" value="always"/>
-                        </menupopup>
-                      </menulist>
-                    </vbox>
-                  </hbox>
-                  <label id="changeBlockListLink"
-                         data-l10n-id="content-blocking-tracking-protection-change-block-list"
-                         is="text-link"
-                         search-l10n-ids="blocklist-window.title, blocklist-description, blocklist-button-cancel.label, blocklist-button-ok.label"/>
-
                 <hbox class="custom-option" id="contentBlockingCryptominersOption">
                   <checkbox id="contentBlockingCryptominersCheckbox"
                             class="content-blocking-checkbox" flex="1"
@@ -336,8 +321,7 @@
                     <label class="content-blocking-warning-title" data-l10n-id="content-blocking-warning-title"/>
                   </hbox>
                   <description class="indent">
-                    <html:span class="tail-with-learn-more" data-l10n-id="content-blocking-etp-warning-description"></html:span>
-                    <label id="" class="learnMore contentBlockWarningLink" data-l10n-id="content-blocking-warning-learn-how" is="text-link"/>
+                    <html:span class="tail-with-learn-more" data-l10n-id="content-blocking-warning-description"></html:span>
                   </description>
                 </vbox>
               </vbox>
diff --git a/browser/components/preferences/in-content/privacy.js b/browser/components/preferences/in-content/privacy.js
index f3a0dd24cb59..ba29f27e4837 100644
--- a/browser/components/preferences/in-content/privacy.js
+++ b/browser/components/preferences/in-content/privacy.js
@@ -234,17 +234,6 @@ function dataCollectionCheckboxHandler({
   updateCheckbox();
 }
 
-// Sets the "Learn how" SUMO link in the Strict/Custom options of Content Blocking.
-function addCustomBlockingLearnMore() {
-  let links = document.querySelectorAll(".contentBlockWarningLink");
-  let contentBlockingWarningUrl =
-    Services.urlFormatter.formatURLPref("app.support.baseURL") +
-    "turn-off-etp-desktop";
-  for (let link of links) {
-    link.setAttribute("href", contentBlockingWarningUrl);
-  }
-}
-
 var gPrivacyPane = {
   _pane: null,
 
@@ -737,24 +726,8 @@ var gPrivacyPane = {
     let link = document.getElementById("contentBlockingLearnMore");
     let contentBlockingUrl =
       Services.urlFormatter.formatURLPref("app.support.baseURL") +
-      "enhanced-tracking-protection";
+      "content-blocking";
     link.setAttribute("href", contentBlockingUrl);
-
-    // Toggles the text "Cross-site and social media trackers" based on the
-    // social tracking pref. If the pref is false, the text reads
-    // "Cross-site trackers".
-    const STP_COOKIES_PREF = "privacy.socialtracking.block_cookies.enabled";
-    if (Services.prefs.getBoolPref(STP_COOKIES_PREF)) {
-      let contentBlockOptionSocialMedia = document.getElementById(
-        "blockCookiesSocialMedia"
-      );
-      document.l10n.setAttributes(
-        contentBlockOptionSocialMedia,
-        "sitedata-option-block-cross-site-and-social-media-trackers"
-      );
-    }
-
-    addCustomBlockingLearnMore();
   },
 
   populateCategoryContents() {
@@ -805,13 +778,6 @@ var gPrivacyPane = {
             ? "fp"
             : "-fp"
         );
-        rulesArray.push(
-          Services.prefs.getBoolPref(
-            "privacy.socialtracking.block_cookies.enabled"
-          )
-            ? "stp"
-            : "-stp"
-        );
         rulesArray.push(
           defaults.getBoolPref("privacy.trackingprotection.enabled")
             ? "tp"
@@ -823,7 +789,6 @@ var gPrivacyPane = {
             : "-tpPrivate"
         );
       }
-
       // Hide all cookie options first, until we learn which one should be showing.
       document.querySelector(selector + " .all-cookies-option").hidden = true;
       document.querySelector(
@@ -835,7 +800,6 @@ var gPrivacyPane = {
       document.querySelector(
         selector + " .all-third-party-cookies-option"
       ).hidden = true;
-      document.querySelector(selector + " .social-media-option").hidden = true;
 
       for (let item of rulesArray) {
         // Note "cookieBehavior0", will result in no UI changes, so is not listed here.
@@ -880,23 +844,6 @@ var gPrivacyPane = {
               selector + " .cryptominers-option"
             ).hidden = true;
             break;
-          case "stp":
-            // Store social tracking cookies pref
-            const STP_COOKIES_PREF =
-              "privacy.socialtracking.block_cookies.enabled";
-
-            if (Services.prefs.getBoolPref(STP_COOKIES_PREF)) {
-              document.querySelector(
-                selector + " .social-media-option"
-              ).hidden = false;
-            }
-            break;
-          case "-stp":
-            // Store social tracking cookies pref
-            document.querySelector(
-              selector + " .social-media-option"
-            ).hidden = true;
-            break;
           case "cookieBehavior1":
             document.querySelector(
               selector + " .all-third-party-cookies-option"
@@ -1488,6 +1435,7 @@ var gPrivacyPane = {
       blockCookiesMenu.selectedIndex = 0;
       return this.writeBlockCookiesFrom();
     }
+
     return Ci.nsICookieService.BEHAVIOR_ACCEPT;
   },
 
diff --git a/browser/components/preferences/in-content/tests/browser_contentblocking.js b/browser/components/preferences/in-content/tests/browser_contentblocking.js
index e55637d7940a..0c1794a2e569 100644
--- a/browser/components/preferences/in-content/tests/browser_contentblocking.js
+++ b/browser/components/preferences/in-content/tests/browser_contentblocking.js
@@ -11,7 +11,6 @@ const TP_PBM_PREF = "privacy.trackingprotection.pbmode.enabled";
 const NCB_PREF = "network.cookie.cookieBehavior";
 const CAT_PREF = "browser.contentblocking.category";
 const FP_PREF = "privacy.trackingprotection.fingerprinting.enabled";
-const STP_PREF = "privacy.trackingprotection.socialtracking.enabled";
 const CM_PREF = "privacy.trackingprotection.cryptomining.enabled";
 const PREF_TEST_NOTIFICATIONS =
   "browser.safebrowsing.test-notifications.enabled";
@@ -176,7 +175,6 @@ add_task(async function testContentBlockingStandardCategory() {
     [TP_PBM_PREF]: null,
     [NCB_PREF]: null,
     [FP_PREF]: null,
-    [STP_PREF]: null,
     [CM_PREF]: null,
   };
 
@@ -203,7 +201,6 @@ add_task(async function testContentBlockingStandardCategory() {
     NCB_PREF,
     Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER
   );
-  Services.prefs.setBoolPref(STP_PREF, !Services.prefs.getBoolPref(STP_PREF));
   Services.prefs.setBoolPref(FP_PREF, !Services.prefs.getBoolPref(FP_PREF));
   Services.prefs.setBoolPref(CM_PREF, !Services.prefs.getBoolPref(CM_PREF));
 
@@ -328,20 +325,6 @@ add_task(async function testContentBlockingStrictCategory() {
           `${FP_PREF} has been set to false`
         );
         break;
-      case "stp":
-        is(
-          Services.prefs.getBoolPref(STP_PREF),
-          true,
-          `${STP_PREF} has been set to true`
-        );
-        break;
-      case "-stp":
-        is(
-          Services.prefs.getBoolPref(STP_PREF),
-          false,
-          `${STP_PREF} has been set to false`
-        );
-        break;
       case "cm":
         is(
           Services.prefs.getBoolPref(CM_PREF),
@@ -417,7 +400,7 @@ add_task(async function testContentBlockingStrictCategory() {
 
 // Tests that the content blocking "Custom" category behaves as expected.
 add_task(async function testContentBlockingCustomCategory() {
-  let prefs = [TP_PREF, TP_PBM_PREF, NCB_PREF, FP_PREF, STP_PREF, CM_PREF];
+  let prefs = [TP_PREF, TP_PBM_PREF, NCB_PREF, FP_PREF, CM_PREF];
 
   await openPreferencesViaOpenPreferencesAPI("privacy", { leaveOpen: true });
   let doc = gBrowser.contentDocument;
@@ -453,8 +436,8 @@ add_task(async function testContentBlockingCustomCategory() {
     () => Services.prefs.getStringPref(CAT_PREF) == "strict"
   );
 
-  // Changing the FP_PREF, STP_PREF, CM_PREF, TP_PREF, or TP_PBM_PREF should necessarily set CAT_PREF to "custom"
-  for (let pref of [FP_PREF, STP_PREF, CM_PREF, TP_PREF, TP_PBM_PREF]) {
+  // Changing the FP_PREF, CM_PREF, TP_PREF, or TP_PBM_PREF should necessarily set CAT_PREF to "custom"
+  for (let pref of [FP_PREF, CM_PREF, TP_PREF, TP_PBM_PREF]) {
     Services.prefs.setBoolPref(pref, !Services.prefs.getBoolPref(pref));
     await TestUtils.waitForCondition(
       () => Services.prefs.getStringPref(CAT_PREF) == "custom"
diff --git a/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_2.js b/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_2.js
index 07b510801d02..b38f2bbdcac4 100644
--- a/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_2.js
+++ b/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_2.js
@@ -21,13 +21,12 @@ add_task(async function() {
 });
 
 /**
- * Test for searching for the "Exceptions - Enhanced Tracking Protection" subdialog:
- * "You’ve turned off protections on these websites." #permissions-exceptions-etp-desc
+ * Test for searching for the "Exceptions - Tracking Protection" subdialog.
  */
 add_task(async function() {
   await openPreferencesViaOpenPreferencesAPI("paneGeneral", {
     leaveOpen: true,
   });
-  await evaluateSearchResults("turned off protections", "trackingGroup");
+  await evaluateSearchResults("disabled content blocking", "trackingGroup");
   BrowserTestUtils.removeTab(gBrowser.selectedTab);
 });
diff --git a/browser/components/preferences/permissions.js b/browser/components/preferences/permissions.js
index de62691cc456..8e4661767e0a 100644
--- a/browser/components/preferences/permissions.js
+++ b/browser/components/preferences/permissions.js
@@ -9,8 +9,8 @@ var { AppConstants } = ChromeUtils.import(
 
 const permissionExceptionsL10n = {
   trackingprotection: {
-    window: "permissions-exceptions-etp-window",
-    description: "permissions-exceptions-etp-desc",
+    window: "permissions-exceptions-content-blocking-window",
+    description: "permissions-exceptions-content-blocking-desc",
   },
   cookie: {
     window: "permissions-exceptions-cookie-window",
diff --git a/browser/locales/en-US/browser/preferences/permissions.ftl b/browser/locales/en-US/browser/preferences/permissions.ftl
index b716ff5526b2..73e3a0eca6b7 100644
--- a/browser/locales/en-US/browser/preferences/permissions.ftl
+++ b/browser/locales/en-US/browser/preferences/permissions.ftl
@@ -79,10 +79,10 @@ permissions-invalid-uri-label = Please enter a valid hostname
 
 ## Exceptions - Tracking Protection
 
-permissions-exceptions-etp-window =
-    .title = Exceptions for Enhanced Tracking Protection
+permissions-exceptions-content-blocking-window =
+    .title = Exceptions - Content Blocking
     .style = { permissions-window.style }
-permissions-exceptions-etp-desc = You’ve turned off protections on these websites.
+permissions-exceptions-content-blocking-desc = You have disabled content blocking on these websites.
 
 ## Exceptions - Cookies
 
diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl
index 51c0ff9b5426..59e48ce407c7 100644
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -843,10 +843,8 @@ sitedata-disallow-cookies-option =
 sitedata-block-desc = Type blocked
     .accesskey = T
 
-sitedata-option-block-cross-site-trackers =
-    .label = Cross-site trackers
-sitedata-option-block-cross-site-and-social-media-trackers =
-    .label = Cross-site and social media trackers
+sitedata-option-block-trackers =
+    .label = Third-party trackers
 sitedata-option-block-unvisited =
     .label = Cookies from unvisited websites
 sitedata-option-block-all-third-party =
@@ -886,7 +884,7 @@ addressbar-suggestions-settings = Change preferences for search engine suggestio
 
 ## Privacy Section - Content Blocking
 
-content-blocking-enhanced-tracking-protection = Enhanced Tracking Protection
+content-blocking-header = Content Blocking
 
 content-blocking-section-description = Protect your privacy while you browse. Block invisible content that tracks the sites you visit and profiles you. Blocking some of this content may make pages load faster.
 
@@ -904,31 +902,29 @@ content-blocking-setting-custom =
   .label = Custom
   .accesskey = C
 
-content-blocking-etp-standard-desc = Balanced for protection and performance. Pages will load normally.
-content-blocking-etp-strict-desc = Stronger protection, but may cause some sites or content to break.
-content-blocking-etp-custom-desc = Choose which trackers and scripts to block.
+content-blocking-standard-desc = Balanced for protection and performance. Allows some trackers so websites function properly.
+content-blocking-strict-description = Stronger protection, may cause some sites to break.
+content-blocking-custom-desc = Choose what to block.
 
-content-blocking-private-windows = Tracking content in Private Windows
-content-blocking-cross-site-tracking-cookies = Cross-site tracking cookies
-content-blocking-social-media-trackers = Social media trackers
+content-blocking-private-trackers = Known trackers only in Private Windows
+content-blocking-third-party-cookies = Third-party tracking cookies
 content-blocking-all-cookies = All cookies
 content-blocking-unvisited-cookies = Cookies from unvisited sites
-content-blocking-all-windows-tracking-content = Tracking content in all windows
+content-blocking-all-windows-trackers = Known trackers in all windows
 content-blocking-all-third-party-cookies = All third-party cookies
 content-blocking-cryptominers = Cryptominers
 content-blocking-fingerprinters = Fingerprinters
 
 content-blocking-warning-title = Heads up!
-content-blocking-etp-warning-description = Blocking trackers could impact the functionality of some sites. Reload a page with trackers to load all content.
-content-blocking-warning-learn-how = Learn how
+content-blocking-warning-description = Blocking content can cause some websites to break. It’s easy to disable blocking for sites you trust.
 
 content-blocking-reload-description = You will need to reload your tabs to apply these changes.
 content-blocking-reload-tabs-button =
   .label = Reload All Tabs
   .accesskey = R
 
-content-blocking-tracking-content-label =
-  .label = Tracking content
+content-blocking-trackers-label =
+  .label = Trackers
   .accesskey = T
 content-blocking-tracking-protection-option-all-windows =
   .label = In all windows
diff --git a/browser/themes/shared/controlcenter/socialblock-disabled.svg b/browser/themes/shared/controlcenter/socialblock-disabled.svg
index d0d59887850a..361bdb4256f3 100644
--- a/browser/themes/shared/controlcenter/socialblock-disabled.svg
+++ b/browser/themes/shared/controlcenter/socialblock-disabled.svg
@@ -1,4 +1,4 @@
 <!-- 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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill="context-fill" fill-opacity="context-fill-opacity" d="M14.51 6.46a1.68 1.68 0 0 0-.16-1.81L7 12a14.73 14.73 0 0 1 1 2.56c.32.5-.65 1.23.59 1.38s1.7-2.1 1.3-3-.89-2.67 0-2.46l.65.15c1.15.35 2.85.49 3.7-.08s.44-1.09.33-1.76a1.73 1.73 0 0 0-.06-2.33zM14.71 1.29a1 1 0 0 0-1.42 0l-.87.88c-.13 0-.25-.09-.39-.12A14.6 14.6 0 0 0 9.71 2c-1.43 0-2.71.19-4.18.25S2.49 2 1 2v6h3a3.65 3.65 0 0 1 .83.66.61.61 0 0 1 .1.23 4.74 4.74 0 0 0 .27.51l-3.9 3.89a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l12-12a1 1 0 0 0-.01-1.42z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="context-fill" fill-opacity="context-fill-opacity" d="M14.51 6.46a1.68 1.68 0 0 0-.16-1.81L7 12a14.73 14.73 0 0 1 1 2.56c.32.5-.65 1.23.59 1.38s1.7-2.1 1.3-3-.89-2.67 0-2.46l.65.15c1.15.35 2.85.49 3.7-.08s.44-1.09.33-1.76a1.73 1.73 0 0 0-.06-2.33zM14.71 1.29a1 1 0 0 0-1.42 0l-.87.88c-.13 0-.25-.09-.39-.12A14.6 14.6 0 0 0 9.71 2c-1.43 0-2.71.19-4.18.25S2.49 2 1 2v6h3a3.65 3.65 0 0 1 .83.66.61.61 0 0 1 .1.23 4.74 4.74 0 0 0 .27.51l-3.9 3.89a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l12-12a1 1 0 0 0-.01-1.42z"/></svg>
diff --git a/browser/themes/shared/controlcenter/tracker-image-disabled.svg b/browser/themes/shared/controlcenter/tracker-image-disabled.svg
index 5012939fa6f8..06d846b3ff9a 100644
--- a/browser/themes/shared/controlcenter/tracker-image-disabled.svg
+++ b/browser/themes/shared/controlcenter/tracker-image-disabled.svg
@@ -1,11 +1,11 @@
 <!-- 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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16">
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M2 15a1 1 0 0 1-.71-.29 1 1 0 0 1 0-1.42l12-12a1 1 0 1 1 1.42 1.42l-12 12A1 1 0 0 1 2 15z"/>
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M14 5v7a1 1 0 0 1-1 1H6l-2 2h9a3 3 0 0 0 3-3V4a3 3 0 0 0-.14-.86z"/>
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M3 13a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h10l1.55-1.55A2.93 2.93 0 0 0 13 1H3a3 3 0 0 0-3 3v8a3 3 0 0 0 1.45 2.55z"/>
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M11.64 7.36L7 12h6V9.18a.47.47 0 0 0-.12-.32z"/>
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M7.29 8.71l-1.52-.6a.5.5 0 0 0-.5.07L3.19 9.85a.49.49 0 0 0-.19.39V12h1z"/>
-  <circle fill="context-fill" fill-opacity="context-fill-opacity" cx="5" cy="6" r="1"/>
+<svg data-name="Flat (For Export)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill="context-fill" d="M2 15a1 1 0 0 1-.71-.29 1 1 0 0 1 0-1.42l12-12a1 1 0 1 1 1.42 1.42l-12 12A1 1 0 0 1 2 15z"/>
+  <path fill="context-fill" d="M14 5v7a1 1 0 0 1-1 1H6l-2 2h9a3 3 0 0 0 3-3V4a3 3 0 0 0-.14-.86z"/>
+  <path fill="context-fill" d="M3 13a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h10l1.55-1.55A2.93 2.93 0 0 0 13 1H3a3 3 0 0 0-3 3v8a3 3 0 0 0 1.45 2.55z"/>
+  <path fill="context-fill" d="M11.64 7.36L7 12h6V9.18a.47.47 0 0 0-.12-.32z"/>
+  <path fill="context-fill" d="M7.29 8.71l-1.52-.6a.5.5 0 0 0-.5.07L3.19 9.85a.49.49 0 0 0-.19.39V12h1z"/>
+  <circle fill="context-fill" cx="5" cy="6" r="1"/>
 </svg>
diff --git a/browser/themes/shared/controlcenter/tracker-image.svg b/browser/themes/shared/controlcenter/tracker-image.svg
index a78f38e36378..ab5fe95677a0 100644
--- a/browser/themes/shared/controlcenter/tracker-image.svg
+++ b/browser/themes/shared/controlcenter/tracker-image.svg
@@ -1,7 +1,7 @@
 <!-- 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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
   <path fill="context-fill" fill-opacity="context-fill-opacity" d="M13 1H3a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h10a3 3 0 0 0 3-3V4a3 3 0 0 0-3-3zm1 11a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h10a1 1 0 0 1 1 1z"/>
   <path fill="context-fill" fill-opacity="context-fill-opacity" d="M3.25 10.07l2-1.76a.49.49 0 0 1 .49-.1l1.93.67a.5.5 0 0 0 .56-.17L10 6.37a.5.5 0 0 1 .77 0l2.13 2.27A.58.58 0 0 1 13 9l.12 2.82-10 .45-.08-1.75a.53.53 0 0 1 .21-.45z"/>
   <circle fill="context-fill" cx="4.89" cy="6.14" r="1"/>
diff --git a/browser/themes/shared/incontentprefs/privacy.css b/browser/themes/shared/incontentprefs/privacy.css
index 7d185db2ca2a..4c17acee2862 100644
--- a/browser/themes/shared/incontentprefs/privacy.css
+++ b/browser/themes/shared/incontentprefs/privacy.css
@@ -19,11 +19,11 @@
 }
 
 #contentBlockingTrackingProtectionCheckbox > .checkbox-label-box {
-  list-style-image: url("chrome://browser/skin/controlcenter/tracker-image.svg");
+  list-style-image: url("chrome://browser/skin/controlcenter/trackers.svg");
 }
 
 #contentBlockingTrackingProtectionCheckbox[checked] > .checkbox-label-box {
-  list-style-image: url("chrome://browser/skin/controlcenter/tracker-image-disabled.svg");
+  list-style-image: url("chrome://browser/skin/controlcenter/trackers-disabled.svg");
 }
 
 #contentBlockingBlockCookiesCheckbox > .checkbox-label-box {
@@ -263,12 +263,7 @@
 }
 
 .content-blocking-trackers-image {
-  list-style-image: url("chrome://browser/skin/controlcenter/tracker-image-disabled.svg");
-  margin-inline-end: 5px;
-}
-
-.content-blocking-social-media-image {
-  list-style-image: url("chrome://browser/skin/controlcenter/socialblock-disabled.svg");
+  list-style-image: url("chrome://browser/skin/controlcenter/trackers-disabled.svg");
   margin-inline-end: 5px;
 }