From 493f267e4a3c7e953e3410fba03ec082d99a3f32 Mon Sep 17 00:00:00 2001
From: Coroiu Cristina <ccoroiu@mozilla.com>
Date: Fri, 23 Aug 2019 20:10:22 +0300
Subject: [PATCH] Backed out changeset 88247bb4d1e9 (bug 1575273) for xpcshell
 failures at
 browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js
 on a CLOSED TREE

---
 browser/components/enterprisepolicies/Policies.jsm | 14 --------------
 .../schemas/policies-schema.json                   |  8 +-------
 .../tests/xpcshell/test_simple_pref_policies.js    | 14 --------------
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/browser/components/enterprisepolicies/Policies.jsm b/browser/components/enterprisepolicies/Policies.jsm
index 90aa1a6726fb..1acb319f3cab 100644
--- a/browser/components/enterprisepolicies/Policies.jsm
+++ b/browser/components/enterprisepolicies/Policies.jsm
@@ -611,20 +611,6 @@ var Policies = {
         setAndLockPref("privacy.trackingprotection.enabled", false);
         setAndLockPref("privacy.trackingprotection.pbmode.enabled", false);
       }
-      if (param.Cryptomining) {
-        setDefaultPref(
-          "privacy.trackingprotection.cryptomining.enabled",
-          param.Cryptomining,
-          param.Locked
-        );
-      }
-      if (param.Fingerprinting) {
-        setDefaultPref(
-          "privacy.trackingprotection.fingerprinting.enabled",
-          param.Fingerprinting,
-          param.Locked
-        );
-      }
     },
   },
 
diff --git a/browser/components/enterprisepolicies/schemas/policies-schema.json b/browser/components/enterprisepolicies/schemas/policies-schema.json
index 61b5e65cc459..4272f27729b9 100644
--- a/browser/components/enterprisepolicies/schemas/policies-schema.json
+++ b/browser/components/enterprisepolicies/schemas/policies-schema.json
@@ -292,13 +292,7 @@
         },
         "Locked": {
           "type": "boolean"
-        },
-        "Cryptomining": {
-          "type": "boolean"
-        },
-        "Fingerprinting": {
-          "type": "boolean"
-        },
+        }
       },
       "required": ["Value"]
     },
diff --git a/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js b/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js
index d99996f80a71..501421263dd8 100644
--- a/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js
+++ b/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js
@@ -90,20 +90,6 @@ const POLICIES_TESTS = [
     },
   },
 
-  {
-    policies: {
-      EnableTrackingProtection: {
-        Cryptomining: true,
-        Fingerprinting: true,
-        Locked: true,
-      },
-    },
-    lockedPrefs: {
-      "privacy.trackingprotection.cryptomining.enabled": false,
-      "privacy.trackingprotection.fingerprinting.enabled": false,
-    },
-  },
-
   // POLICY: OverrideFirstRunPage
   {
     policies: { OverrideFirstRunPage: "https://www.example.com/" },