From da4c7e7ed675c3bf405668739c3012d140856109 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:34:42 +0200
Subject: Adding upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../enterprisepolicies/EnterprisePoliciesParent.sys.mjs           | 2 +-
 toolkit/components/enterprisepolicies/nsIEnterprisePolicies.idl   | 8 ++++----
 .../enterprisepolicies/tests/EnterprisePolicyTesting.sys.mjs      | 2 +-
 .../tests/browser/browser_policies_enterprise_only.js             | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'toolkit/components/enterprisepolicies')

diff --git a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs
index 15fa2193c6..00a5381133 100644
--- a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs
+++ b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs
@@ -296,7 +296,7 @@ EnterprisePoliciesManager.prototype = {
   },
 
   // nsIObserver implementation
-  observe: function BG_observe(subject, topic, data) {
+  observe: function BG_observe(subject, topic) {
     switch (topic) {
       case "policies-startup":
         // Before the first set of policy callbacks runs, we must
diff --git a/toolkit/components/enterprisepolicies/nsIEnterprisePolicies.idl b/toolkit/components/enterprisepolicies/nsIEnterprisePolicies.idl
index 03c51af49f..24d4ae4dcf 100644
--- a/toolkit/components/enterprisepolicies/nsIEnterprisePolicies.idl
+++ b/toolkit/components/enterprisepolicies/nsIEnterprisePolicies.idl
@@ -15,7 +15,7 @@ interface nsIEnterprisePolicies : nsISupports
 
   readonly attribute short status;
 
-  bool isAllowed(in ACString feature);
+  boolean isAllowed(in ACString feature);
 
   /**
    * Get the active policies that have been successfully parsed.
@@ -56,7 +56,7 @@ interface nsIEnterprisePolicies : nsISupports
    *
    * @returns A boolean - true of the addon may be installed.
    */
-  bool mayInstallAddon(in jsval addon);
+  boolean mayInstallAddon(in jsval addon);
 
   /**
    * Uses install_sources to determine if an addon can be installed
@@ -64,7 +64,7 @@ interface nsIEnterprisePolicies : nsISupports
    *
    * @returns A boolean - true of the addon may be installed.
    */
-  bool allowedInstallSource(in nsIURI uri);
+  boolean allowedInstallSource(in nsIURI uri);
   /**
    * Uses ExemptDomainFileTypePairsFromFileTypeDownloadWarnings to determine
    * if a given file extension is exempted from executable behavior and
@@ -72,5 +72,5 @@ interface nsIEnterprisePolicies : nsISupports
    *
    * @returns A boolean - true if the extension should be exempt.
    */
-  bool isExemptExecutableExtension(in ACString url, in ACString extension);
+  boolean isExemptExecutableExtension(in ACString url, in ACString extension);
 };
diff --git a/toolkit/components/enterprisepolicies/tests/EnterprisePolicyTesting.sys.mjs b/toolkit/components/enterprisepolicies/tests/EnterprisePolicyTesting.sys.mjs
index b877c6f738..dd0f5caf89 100644
--- a/toolkit/components/enterprisepolicies/tests/EnterprisePolicyTesting.sys.mjs
+++ b/toolkit/components/enterprisepolicies/tests/EnterprisePolicyTesting.sys.mjs
@@ -83,7 +83,7 @@ export var EnterprisePolicyTesting = {
 /**
  * This helper will track prefs that have been changed
  * by the policy engine through the setAndLockPref and
- * setDefaultPref APIs (from Policies.jsm) and make sure
+ * setDefaultPref APIs (from Policies.sys.mjs) and make sure
  * that they are restored to their original values when
  * the test ends or another test case restarts the engine.
  */
diff --git a/toolkit/components/enterprisepolicies/tests/browser/browser_policies_enterprise_only.js b/toolkit/components/enterprisepolicies/tests/browser/browser_policies_enterprise_only.js
index 3da3d250c6..c0fd63870a 100644
--- a/toolkit/components/enterprisepolicies/tests/browser/browser_policies_enterprise_only.js
+++ b/toolkit/components/enterprisepolicies/tests/browser/browser_policies_enterprise_only.js
@@ -14,13 +14,13 @@ add_task(async function test_enterprise_only_policies() {
     enterprisePolicyRan = false;
 
   Policies.NormalPolicy = {
-    onProfileAfterChange(manager, param) {
+    onProfileAfterChange() {
       normalPolicyRan = true;
     },
   };
 
   Policies.EnterpriseOnlyPolicy = {
-    onProfileAfterChange(manager, param) {
+    onProfileAfterChange() {
       enterprisePolicyRan = true;
     },
   };
-- 
cgit v1.2.3