Merge mozilla-mobile#4430

4430: Closes mozilla-mobile#4428: Remove fingerprint from the tracking protection recommended policy. r=pocmo a=Amejia481



Co-authored-by: Arturo Mejia <[email protected]>

Author: MozLando

components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt

@@ -220,12 +220,13 @@ abstract class EngineSession(
             SCRIPTS_AND_SUB_RESOURCES(1 shl 9999),
 
             RECOMMENDED(AD.id + ANALYTICS.id + SOCIAL.id + TEST.id + MOZILLA_SOCIAL.id +
-                CRYPTOMINING.id + FINGERPRINTING.id),
+                CRYPTOMINING.id),
 
             /**
-             * Combining the [RECOMMENDED] categories plus [CRYPTOMINING] and [FINGERPRINTING].
+             * Combining the [RECOMMENDED] categories plus [SCRIPTS_AND_SUB_RESOURCES]
+             * and [FINGERPRINTING].
              */
-            STRICT(RECOMMENDED.id + SCRIPTS_AND_SUB_RESOURCES.id)
+            STRICT(RECOMMENDED.id + SCRIPTS_AND_SUB_RESOURCES.id + FINGERPRINTING.id)
         }
 
         companion object {

components/concept/engine/src/test/java/mozilla/components/concept/engine/EngineSessionTest.kt

@@ -688,7 +688,6 @@ class EngineSessionTest {
         assertTrue(recommendedPolicy.contains(TrackingCategory.SOCIAL))
         assertTrue(recommendedPolicy.contains(TrackingCategory.TEST))
 
-        assertTrue(recommendedPolicy.contains(TrackingCategory.FINGERPRINTING))
         assertTrue(recommendedPolicy.contains(TrackingCategory.CRYPTOMINING))
         assertFalse(recommendedPolicy.contains(TrackingCategory.CONTENT))
 
@@ -699,7 +698,6 @@ class EngineSessionTest {
         assertTrue(strictPolicy.contains(TrackingCategory.ANALYTICS))
         assertTrue(strictPolicy.contains(TrackingCategory.SOCIAL))
         assertTrue(strictPolicy.contains(TrackingCategory.TEST))
-        assertTrue(strictPolicy.contains(TrackingCategory.FINGERPRINTING))
         assertTrue(strictPolicy.contains(TrackingCategory.CRYPTOMINING))
         assertFalse(strictPolicy.contains(TrackingCategory.CONTENT))
     }