Backed out changeset 39c2628de53e (bug 1522919) for browser chrome failures at content/test/trackingUI/browser_trackingUI_cryptominers.js on a CLOSED TREE

browser/base/content/browser-contentblocking.js

@@ -1044,15 +1044,7 @@ var ContentBlocking = {
     Services.telemetry.getHistogramById("TRACKING_PROTECTION_SHIELD").add(value);
   },
 
-  cryptominersHistogramAdd(value) {
-    Services.telemetry.getHistogramById("CRYPTOMINERS_BLOCKED_COUNT").add(value);
-  },
-
-  fingerprintersHistogramAdd(value) {
-    Services.telemetry.getHistogramById("FINGERPRINTERS_BLOCKED_COUNT").add(value);
-  },
-
-  onLocationChange() {
+  onContentBlockingEvent(event, webProgress, isSimulated) {
     let baseURI = this._baseURIForChannelClassifier;
 
     // Don't deal with about:, file: etc.
@@ -1062,19 +1054,6 @@ var ContentBlocking = {
       this.iconBox.removeAttribute("hasException");
       return;
     }
-    // Add to telemetry per page load as a baseline measurement.
-    this.fingerprintersHistogramAdd("pageLoad");
-    this.cryptominersHistogramAdd("pageLoad");
-  },
-
-  onContentBlockingEvent(event, webProgress, isSimulated) {
-    let previousState = gBrowser.securityUI.contentBlockingEvent;
-    let baseURI = this._baseURIForChannelClassifier;
-
-    // Don't deal with about:, file: etc.
-    if (!baseURI) {
-      return;
-    }
 
     let anyDetected = false;
     let anyBlocking = false;
@@ -1151,25 +1130,6 @@ var ContentBlocking = {
       this.iconBox.removeAttribute("tooltiptext");
       this.shieldHistogramAdd(0);
     }
-
-    // We report up to one instance of fingerprinting and cryptomining
-    // blocking and/or allowing per page load.
-    let fingerprintingBlocking = Fingerprinting.isBlocking(event) && !Fingerprinting.isBlocking(previousState);
-    let fingerprintingAllowing = Fingerprinting.isAllowing(event) && !Fingerprinting.isAllowing(previousState);
-    let cryptominingBlocking = Cryptomining.isBlocking(event) && !Cryptomining.isBlocking(previousState);
-    let cryptominingAllowing = Cryptomining.isAllowing(event) && !Cryptomining.isAllowing(previousState);
-
-    if (fingerprintingBlocking) {
-      this.fingerprintersHistogramAdd("blocked");
-    } else if (fingerprintingAllowing) {
-      this.fingerprintersHistogramAdd("allowed");
-    }
-
-    if (cryptominingBlocking) {
-      this.cryptominersHistogramAdd("blocked");
-    } else if (cryptominingAllowing) {
-      this.cryptominersHistogramAdd("allowed");
-    }
   },
 
   disableForCurrentPage() {

browser/base/content/browser.js

@@ -5447,8 +5447,6 @@ var TabsProgressListener = {
     gBrowser.getNotificationBox(aBrowser).removeTransientNotifications();
 
     FullZoom.onLocationChange(aLocationURI, false, aBrowser);
-
-    ContentBlocking.onLocationChange();
   },
 
   onLinkIconAvailable(browser, dataURI, iconURI) {

browser/base/content/test/trackingUI/browser_trackingUI_cryptominers.js

@@ -6,7 +6,6 @@
 
 const TRACKING_PAGE = "http://example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
 const CM_PREF = "privacy.trackingprotection.cryptomining.enabled";
-let cmHistogram;
 
 add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({set: [
@@ -16,14 +15,9 @@ add_task(async function setup() {
     [ "privacy.trackingprotection.annotate_channels", false ],
     [ "privacy.trackingprotection.fingerprinting.enabled", false ],
   ]});
-  cmHistogram = Services.telemetry.getHistogramById("CRYPTOMINERS_BLOCKED_COUNT");
-  registerCleanupFunction(() => {
-    cmHistogram.clear();
-  });
 });
 
 async function testIdentityState(hasException) {
-  cmHistogram.clear();
   let promise = BrowserTestUtils.openNewForegroundTab({url: TRACKING_PAGE, gBrowser});
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent()]);
 
@@ -55,13 +49,10 @@ async function testIdentityState(hasException) {
     await loaded;
   }
 
-  testTelemetry(1, 1, hasException);
-
   BrowserTestUtils.removeTab(tab);
 }
 
 async function testSubview(hasException) {
-  cmHistogram.clear();
   let promise = BrowserTestUtils.openNewForegroundTab({url: TRACKING_PAGE, gBrowser});
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent()]);
 
@@ -109,18 +100,9 @@ async function testSubview(hasException) {
     await loaded;
   }
 
-  testTelemetry(1, 1, hasException);
-
   BrowserTestUtils.removeTab(tab);
 }
 
-function testTelemetry(pagesVisited, pagesWithBlockableContent, hasException) {
-  let results = cmHistogram.snapshot();
-  Assert.equal(results.values[0], pagesVisited, "The correct number of page loads have been recorded");
-  let expectedValue = hasException ? 2 : 1;
-  Assert.equal(results.values[expectedValue], pagesWithBlockableContent, "The correct number of cryptominers have been recorded as blocked or allowed.");
-}
-
 add_task(async function test() {
   Services.prefs.setBoolPref(CM_PREF, true);
 

browser/base/content/test/trackingUI/browser_trackingUI_fingerprinters.js

@@ -6,7 +6,6 @@
 
 const TRACKING_PAGE = "http://example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
 const FP_PREF = "privacy.trackingprotection.fingerprinting.enabled";
-let fpHistogram;
 
 add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({set: [
@@ -16,14 +15,9 @@ add_task(async function setup() {
     [ "privacy.trackingprotection.annotate_channels", false ],
     [ "privacy.trackingprotection.cryptomining.enabled", false ],
   ]});
-  fpHistogram = Services.telemetry.getHistogramById("FINGERPRINTERS_BLOCKED_COUNT");
-  registerCleanupFunction(() => {
-    fpHistogram.clear();
-  });
 });
 
 async function testIdentityState(hasException) {
-  fpHistogram.clear();
   let promise = BrowserTestUtils.openNewForegroundTab({url: TRACKING_PAGE, gBrowser});
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent()]);
 
@@ -55,13 +49,10 @@ async function testIdentityState(hasException) {
     await loaded;
   }
 
-  testTelemetry(1, 1, hasException);
-
   BrowserTestUtils.removeTab(tab);
 }
 
 async function testSubview(hasException) {
-  fpHistogram.clear();
   let promise = BrowserTestUtils.openNewForegroundTab({url: TRACKING_PAGE, gBrowser});
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent()]);
 
@@ -109,18 +100,9 @@ async function testSubview(hasException) {
     await loaded;
   }
 
-  testTelemetry(1, 1, hasException);
-
   BrowserTestUtils.removeTab(tab);
 }
 
-function testTelemetry(pagesVisited, pagesWithBlockableContent, hasException) {
-  let results = fpHistogram.snapshot();
-  Assert.equal(results.values[0], pagesVisited, "The correct number of page loads have been recorded");
-  let expectedValue = hasException ? 2 : 1;
-  Assert.equal(results.values[expectedValue], pagesWithBlockableContent, "The correct number of fingerprinters have been recorded as blocked or allowed.");
-}
-
 add_task(async function test() {
   Services.prefs.setBoolPref(FP_PREF, true);
 

toolkit/components/telemetry/Histograms.json

@@ -11460,34 +11460,6 @@
     "alert_emails": ["pdol@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
     "bug_numbers": [1200944]
   },
-  "FINGERPRINTERS_BLOCKED_COUNT": {
-    "record_in_processes": ["main"],
-    "expires_in_version": "never",
-    "releaseChannelCollection": "opt-out",
-    "kind": "categorical",
-    "labels": [
-      "pageLoad",
-      "blocked",
-      "allowed"
-    ],
-    "description": "A count of the status of fingerprinter blocking per top level page load. ('pageLoad' = There was a page load, 'blocked' = at least one fingerprinter was blocked, 'allowed' = at least one fingerprinter was detected and allowed.) Note, pageLoad is used as a baseline measurement.",
-    "alert_emails": ["aedelstein@mozilla.com", "seceng-telemetry@mozilla.com"],
-    "bug_numbers": [1522919]
-  },
-  "CRYPTOMINERS_BLOCKED_COUNT": {
-    "record_in_processes": ["main"],
-    "expires_in_version": "never",
-    "releaseChannelCollection": "opt-out",
-    "kind": "categorical",
-    "labels": [
-      "pageLoad",
-      "blocked",
-      "allowed"
-    ],
-    "description": "A count of the status of cryptominer blocking per top level page load. ('pageLoad' = There was a page load, 'blocked' = at least one cryptominer was blocked, 'allowed' = at least one cryptominer was detected and allowed.) Note, pageLoad is used as a baseline measurement.",
-    "alert_emails": ["aedelstein@mozilla.com", "seceng-telemetry@mozilla.com"],
-    "bug_numbers": [1522919]
-  },
   "FENNEC_TRACKING_PROTECTION_STATE": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",