tor-browser

commit 985ad0506da6dc3c3465ec14b90218694c762727
parent e6f25a8d314a64ce7e2ad887513e32b998588463
Author: Sandor Molnar <smolnar@mozilla.com>
Date:   Sat, 10 Jan 2026 00:37:38 +0200

Revert "Bug 2003365 - Add EnterprisePolicy to disable rollouts r=mkaply,nimbus-reviewers,fluent-reviewers,relud,flod" for causing xpc failures @ test_sorted_alphabetically.js

This reverts commit aa9c92eedbe334df8d86938519849ff4063538bd.

Diffstat:
M
browser/components/enterprisepolicies/Policies.sys.mjs
 | 
8
--------
M
browser/components/enterprisepolicies/schemas/policies-schema.json
 | 
4
----
M
browser/locales/en-US/browser/policies/policies-descriptions.ftl
 | 
2
--
M
toolkit/components/nimbus/ExperimentAPI.sys.mjs
 | 
5
+----
M
toolkit/components/nimbus/test/unit/test_policy.js
 | 
41
+++++++++--------------------------------

5 files changed, 10 insertions(+), 50 deletions(-)
diff --git a/browser/components/enterprisepolicies/Policies.sys.mjs b/browser/components/enterprisepolicies/Policies.sys.mjs
@@ -996,14 +996,6 @@ export var Policies = {
     },
   },
 
-  DisableRemoteImprovements: {
-    onBeforeAddons(manager, param) {
-      if (param) {
-        manager.disallowFeature("NimbusRollouts");
-      }
-    },
-  },
-
   DisableForgetButton: {
     onProfileAfterChange(manager, param) {
       if (param) {
diff --git a/browser/components/enterprisepolicies/schemas/policies-schema.json b/browser/components/enterprisepolicies/schemas/policies-schema.json
@@ -559,10 +559,6 @@
       "type": "boolean"
     },
 
-    "DisableRemoteImprovements": {
-      "type": "boolean"
-    },
-
     "DisableSafeMode": {
       "type": "boolean"
     },
diff --git a/browser/locales/en-US/browser/policies/policies-descriptions.ftl b/browser/locales/en-US/browser/policies/policies-descriptions.ftl
@@ -94,8 +94,6 @@ policy-DisableProfileImport = Disable the menu command to Import data from anoth
 
 policy-DisableProfileRefresh = Disable the Refresh { -brand-short-name } button in the about:support page.
 
-policy-DisableRemoteImprovements = Prevent { -brand-short-name } from applying performance, stability, and feature changes between updates.
-
 policy-DisableSafeMode = Disable the feature to restart in Safe Mode. Note: the Shift key to enter Safe Mode can only be disabled on Windows using Group Policy.
 
 policy-DisableSecurityBypass = Prevent the user from bypassing certain security warnings.
diff --git a/toolkit/components/nimbus/ExperimentAPI.sys.mjs b/toolkit/components/nimbus/ExperimentAPI.sys.mjs
@@ -424,10 +424,7 @@ export const ExperimentAPI = new (class {
   }
 
   get rolloutsEnabled() {
-    return (
-      this.#prefValues.rolloutsEnabled &&
-      Services.policies.isAllowed("NimbusRollouts")
-    );
+    return this.#prefValues.rolloutsEnabled;
   }
 
   get studiesEnabled() {
diff --git a/toolkit/components/nimbus/test/unit/test_policy.js b/toolkit/components/nimbus/test/unit/test_policy.js
@@ -39,7 +39,6 @@ add_setup(function setup() {
 async function doTest({
   policies,
   labsEnabled,
-  rolloutsEnabled,
   studiesEnabled,
   existingEnrollments = [],
   expectedEnrollments,
@@ -76,36 +75,31 @@ async function doTest({
   await initExperimentAPI();
 
   Assert.equal(
-    ExperimentAPI.labsEnabled,
-    labsEnabled,
-    "FirefoxLabs is enabled"
-  );
-  Assert.equal(
-    ExperimentAPI.rolloutsEnabled,
-    rolloutsEnabled,
-    "Rollouts are enabled"
-  );
-  Assert.equal(
     ExperimentAPI.studiesEnabled,
     studiesEnabled,
     "Studies are enabled"
   );
+  Assert.equal(
+    ExperimentAPI.labsEnabled,
+    labsEnabled,
+    "FirefoxLabs is enabled"
+  );
 
   Assert.equal(
     loader._enabled,
-    labsEnabled || rolloutsEnabled || studiesEnabled,
+    studiesEnabled || labsEnabled,
     "RemoteSettingsExperimentLoader initialized"
   );
 
   Assert.equal(
     loader.setTimer.called,
-    labsEnabled || rolloutsEnabled || studiesEnabled,
+    studiesEnabled || labsEnabled,
     "RemoteSettingsExperimentLoader polling for recipes"
   );
 
   Assert.equal(
     loader.updateRecipes.called,
-    labsEnabled || rolloutsEnabled || studiesEnabled,
+    studiesEnabled || labsEnabled,
     "RemoteSettingsExperimentLoader polling for recipes"
   );
 
@@ -133,9 +127,8 @@ add_task(async function testDisableStudiesPolicy() {
   await doTest({
     policies: { DisableFirefoxStudies: true },
     labsEnabled: true,
-    rolloutsEnabled: true,
     studiesEnabled: false,
-    expectedEnrollments: ["rollout"],
+    expectedEnrollments: [],
     expectedOptIns: ["optin"],
   });
 });
@@ -144,7 +137,6 @@ add_task(async function testDisableLabsPolicy() {
   await doTest({
     policies: { UserMessaging: { FirefoxLabs: false } },
     labsEnabled: false,
-    rolloutsEnabled: true,
     studiesEnabled: true,
     expectedEnrollments: ["experiment", "rollout"],
     expectedOptIns: [],
@@ -154,12 +146,10 @@ add_task(async function testDisableLabsPolicy() {
 add_task(async function testNimbusDisabled() {
   await doTest({
     policies: {
-      DisableRemoteImprovements: true,
       DisableFirefoxStudies: true,
       UserMessaging: { FirefoxLabs: false },
     },
     labsEnabled: false,
-    rolloutsEnabled: false,
     studiesEnabled: false,
     expectedEnrollments: [],
     expectedOptIns: [],
@@ -170,22 +160,9 @@ add_task(async function testDisableLabsPolicyCausesUnenrollments() {
   await doTest({
     policies: { UserMessaging: { FirefoxLabs: false } },
     labsEnabled: false,
-    rolloutsEnabled: true,
     studiesEnabled: true,
     expectedEnrollments: ["experiment", "rollout"],
     existingEnrollments: ["optin"],
     expectedOptIns: [],
   });
 });
-
-add_task(async function testDisableRolloutPolicyCausesUnenrollments() {
-  await doTest({
-    policies: { DisableRemoteImprovements: true },
-    labsEnabled: true,
-    rolloutsEnabled: false,
-    studiesEnabled: true,
-    expectedEnrollments: ["experiment"],
-    existingEnrollments: ["rollout"],
-    expectedOptIns: ["optin"],
-  });
-});