Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 9 insertions, 2 deletions

diff --git a/toolkit/components/antitracking/bouncetrackingprotection/nsIBounceTrackingProtection.idl b/toolkit/components/antitracking/bouncetrackingprotection/nsIBounceTrackingProtection.idl
index 1163492333..d52113118e 100644
--- a/toolkit/components/antitracking/bouncetrackingprotection/nsIBounceTrackingProtection.idl
+++ b/toolkit/components/antitracking/bouncetrackingprotection/nsIBounceTrackingProtection.idl
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
+#include "nsIBounceTrackingMapEntry.idl"
 
 [scriptable, uuid(4866F748-29DA-4C10-8EAA-ED2F7851E6B1)]
 interface nsIBounceTrackingProtection : nsISupports {
@@ -37,14 +38,20 @@ interface nsIBounceTrackingProtection : nsISupports {
     // State is keyed by OriginAttributes.
 
     [implicit_jscontext]
-    Array<ACString> testGetBounceTrackerCandidateHosts(in jsval originAttributes);
+    Array<nsIBounceTrackingMapEntry> testGetBounceTrackerCandidateHosts(in jsval originAttributes);
 
     [implicit_jscontext]
-    Array<ACString> testGetUserActivationHosts(in jsval originAttributes);
+    Array<nsIBounceTrackingMapEntry> testGetUserActivationHosts(in jsval originAttributes);
 
     [implicit_jscontext]
     void testAddBounceTrackerCandidate(in jsval originAttributes, in ACString aSiteHost, in PRTime aBounceTime);
 
     [implicit_jscontext]
     void testAddUserActivation(in jsval originAttributes, in ACString aSiteHost, in PRTime aActivationTime);
+
+    // Test helper to trigger user activation import from the permission
+    // manager. Will only import if the pref
+    // privacy.bounceTrackingProtection.hasMigratedUserActivationData is set to
+    // false.
+    void testMaybeMigrateUserInteractionPermissions();
 };