Backed out changeset 8ae2da51010e (bug 1522919) for mochitest failures on a CLOSED TREE

browser/base/content/browser-contentblocking.js

@@ -4,7 +4,6 @@
 
 var Fingerprinting = {
   PREF_ENABLED: "privacy.trackingprotection.fingerprinting.enabled",
-  telemetryIdentifier: "fp",
 
   strings: {
     get subViewBlocked() {
@@ -115,7 +114,6 @@ var Fingerprinting = {
 
 var Cryptomining = {
   PREF_ENABLED: "privacy.trackingprotection.cryptomining.enabled",
-  telemetryIdentifier: "cm",
 
   strings: {
     get subViewBlocked() {

browser/components/BrowserGlue.jsm

@@ -1406,12 +1406,6 @@ BrowserGlue.prototype = {
       }
     }
     Services.telemetry.scalarSet("contentblocking.exceptions", exceptions);
-
-    let fpEnabled = Services.prefs.getBoolPref("privacy.trackingprotection.fingerprinting.enabled");
-    let cmEnabled = Services.prefs.getBoolPref("privacy.trackingprotection.cryptomining.enabled");
-
-    Services.telemetry.scalarSet("contentblocking.fingerprinting_blocking_enabled", fpEnabled);
-    Services.telemetry.scalarSet("contentblocking.cryptomining_blocking_enabled", cmEnabled);
   },
 
   _sendMediaTelemetry() {

toolkit/components/telemetry/Events.yaml

@@ -808,7 +808,6 @@ security.ui.identitypopup:
     bug_numbers:
       - 1484251
       - 1522256
-      - 1522919
     description: >
       How many times the control center was opened.
       Keyed by the state of the content blocking shield, where the shield-showing key indicates
@@ -823,8 +822,6 @@ security.ui.identitypopup:
     record_in_processes:
       - main
     extra_keys:
-      fp: Whether Fingerprinter blocking was active while the user opened the popup
-      cm: Whether Cryptominer blocking was active while the user opened the popup
       tp: Whether Tracking Protection was active while the user opened the popup
       cr: Whether Cookie Restrictions was active while the user opened the popup
     products:
@@ -857,8 +854,6 @@ security.ui.identitypopup:
     record_in_processes:
       - main
     extra_keys:
-      fp: Whether Fingerprinter blocking was active while the user interacted with the UI
-      cm: Whether Cryptominer blocking was active while the user interacted with the UI
       tp: Whether Tracking Protection was active while the user interacted with the UI
       cr: Whether Cookie Restrictions was active while the user interacted with the UI
     products:

toolkit/components/telemetry/Scalars.yaml

@@ -480,32 +480,6 @@ contentblocking:
     release_channel_collection: opt-out
     record_in_processes:
       - main
-  cryptomining_blocking_enabled:
-    bug_numbers:
-      - 1522919
-    description: >
-      True if cryptominer blocking is enabled globally at startup.
-    expires: never
-    kind: boolean
-    notification_emails:
-      - aedelstein@mozilla.com
-      - seceng-telemetry@mozilla.com
-    release_channel_collection: opt-out
-    record_in_processes:
-      - main
-  fingerprinting_blocking_enabled:
-    bug_numbers:
-      - 1522919
-    description: >
-      True if fingerprinter blocking is enabled globally at startup.
-    expires: never
-    kind: boolean
-    notification_emails:
-      - aedelstein@mozilla.com
-      - seceng-telemetry@mozilla.com
-    release_channel_collection: opt-out
-    record_in_processes:
-      - main
 
 sandbox:
   no_job: