Bug 1832845: Remove privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts pref. r=timhuang

Differential Revision: https://phabricator.services.mozilla.com/D218851

browser/base/content/test/permissions/browser_canvas_fingerprinting_resistance.js

@@ -70,15 +70,18 @@ function enableResistFingerprinting(
 ) {
   return SpecialPowers.pushPrefEnv({
     set: [
-      ["privacy.resistFingerprinting", true],
+      ["privacy.fingerprintingProtection", true],
+      [
+        "privacy.fingerprintingProtection.overrides",
+        "+CanvasRandomization,+CanvasImageExtractionPrompt,+CanvasExtractionFromThirdPartiesIsBlocked" +
+          (autoDeclineNoInput
+            ? ",+CanvasExtractionBeforeUserInputIsBlocked"
+            : ""),
+      ],
       [
         "privacy.resistFingerprinting.randomDataOnCanvasExtract",
         randomDataOnCanvasExtract,
       ],
-      [
-        "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts",
-        autoDeclineNoInput,
-      ],
     ],
   });
 }

dom/canvas/CanvasUtils.cpp

@@ -195,8 +195,6 @@ bool IsImageExtractionAllowed(dom::Document* aDocument, JSContext* aCx,
   bool hidePermissionDoorhanger = false;
   if (!aDocument->ShouldResistFingerprinting(
           RFPTarget::CanvasImageExtractionPrompt) &&
-      StaticPrefs::
-          privacy_resistFingerprinting_autoDeclineNoUserInputCanvasPrompts() &&
       aDocument->ShouldResistFingerprinting(
           RFPTarget::CanvasExtractionBeforeUserInputIsBlocked)) {
     // If so, see if this is in response to user input.
@@ -212,8 +210,6 @@ bool IsImageExtractionAllowed(dom::Document* aDocument, JSContext* aCx,
   // and show some sort of prompt maybe with the doorhanger, maybe not
 
   hidePermissionDoorhanger |=
-      StaticPrefs::
-          privacy_resistFingerprinting_autoDeclineNoUserInputCanvasPrompts() &&
       aDocument->ShouldResistFingerprinting(
           RFPTarget::CanvasExtractionBeforeUserInputIsBlocked) &&
       !dom::UserActivation::IsHandlingUserInput();

modules/libpref/init/StaticPrefList.yaml

@@ -14510,16 +14510,6 @@
   value: true
   mirror: always
 
-# We automatically decline canvas permission requests if they are not initiated
-# from user input. Just in case that breaks something, we allow the user to
-# revert this behavior with this obscure pref. We do not intend to support this
-# long term. If you do set it, to work around some broken website, please file
-# a bug with information so we can understand why it is needed.
-- name: privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts
-  type: bool
-  value: true
-  mirror: always
-
 # This pref can be used to disable mozAddonManager entirely for fingerprinting
 # reasons. Someone like Tor browser will use this pref.
 # NOTE: We'd like this to be a "hidden" pref once StaticPrefs supports it.