Merging upstream version 127.0.

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

1 files changed, 13 insertions, 4 deletions

diff --git a/toolkit/components/contentanalysis/tests/browser/browser_content_analysis_policies.js b/toolkit/components/contentanalysis/tests/browser/browser_content_analysis_policies.js
index b226c0a37a..e7122508e1 100644
--- a/toolkit/components/contentanalysis/tests/browser/browser_content_analysis_policies.js
+++ b/toolkit/components/contentanalysis/tests/browser/browser_content_analysis_policies.js
@@ -25,7 +25,8 @@ const kAgentNamePref = "agent_name";
 const kClientSignaturePref = "client_signature";
 const kPerUserPref = "is_per_user";
 const kShowBlockedPref = "show_blocked_result";
-const kDefaultAllowPref = "default_allow";
+const kDefaultResultPref = "default_result";
+const kBypassForSameTabOperationsPref = "bypass_for_same_tab_operations";
 
 const ca = Cc["@mozilla.org/contentanalysis;1"].getService(
   Ci.nsIContentAnalysis
@@ -87,7 +88,8 @@ add_task(async function test_ca_enterprise_config() {
         ClientSignature: string4,
         IsPerUser: true,
         ShowBlockedResult: false,
-        DefaultAllow: true,
+        DefaultResult: 1,
+        BypassForSameTabOperations: true,
       },
     },
   });
@@ -135,9 +137,16 @@ add_task(async function test_ca_enterprise_config() {
     "show blocked match"
   );
   is(
-    Services.prefs.getBoolPref("browser.contentanalysis." + kDefaultAllowPref),
+    Services.prefs.getIntPref("browser.contentanalysis." + kDefaultResultPref),
+    1,
+    "default result match"
+  );
+  is(
+    Services.prefs.getBoolPref(
+      "browser.contentanalysis." + kBypassForSameTabOperationsPref
+    ),
     true,
-    "default allow match"
+    "bypass for same tab operations match"
   );
   PoliciesPrefTracker.stop();
 });