Bug 1888451 - Disable history dropdown when SanitizeOnShutdown locks the pref. r=mstriemer,bvandersloot

Differential Revision: https://phabricator.services.mozilla.com/D299827

Author: mkaply

browser/components/enterprisepolicies/tests/browser/browser.toml

@@ -122,6 +122,8 @@ support-files = [
 
 ["browser_policy_privatebrowsingmodeavailability_srd.js"]
 
+["browser_policy_sanitize_on_shutdown.js"]
+
 ["browser_policy_search_engine.js"]
 
 ["browser_policy_searchbar.js"]

browser/components/enterprisepolicies/tests/browser/browser_policy_sanitize_on_shutdown.js

@@ -0,0 +1,82 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const SRD_ENABLED = Services.prefs.getBoolPref(
+  "browser.settings-redesign.enabled",
+  false
+);
+
+async function checkPrivacyPreferences(expectedDisabled) {
+  await BrowserTestUtils.withNewTab(
+    "about:preferences#privacy",
+    async browser => {
+      await SpecialPowers.spawn(
+        browser,
+        [{ expectedDisabled, srdEnabled: SRD_ENABLED }],
+        async ({ expectedDisabled: expected, srdEnabled }) => {
+          let { historyMode, ...sub } = expected;
+          is(
+            content.document.getElementById("historyMode").disabled,
+            historyMode,
+            "#historyMode disabled state"
+          );
+          if (srdEnabled) {
+            await content.gotoPref("paneHistory");
+            await new Promise(r => content.requestAnimationFrame(r));
+          }
+          for (let [id, exp] of Object.entries(sub)) {
+            let el = srdEnabled
+              ? content.document.querySelector(
+                  `setting-group[groupid='historyAdvanced'] #${id}`
+                )
+              : content.document.getElementById(id);
+            is(el.disabled, exp, `#${id} disabled state`);
+          }
+        }
+      );
+    }
+  );
+}
+
+const ALL_DISABLED = {
+  historyMode: true,
+  privateBrowsingAutoStart: true,
+  alwaysClear: true,
+  rememberHistory: false,
+  rememberForms: false,
+};
+
+const NONE_DISABLED = {
+  historyMode: false,
+  privateBrowsingAutoStart: false,
+  alwaysClear: false,
+  rememberHistory: false,
+  rememberForms: false,
+};
+
+add_task(async function test_sanitizeOnShutdown_boolean_true() {
+  await setupPolicyEngineWithJson({
+    policies: { SanitizeOnShutdown: true },
+  });
+  await checkPrivacyPreferences(ALL_DISABLED);
+});
+
+add_task(async function test_sanitizeOnShutdown_object_locked_true() {
+  await setupPolicyEngineWithJson({
+    policies: {
+      SanitizeOnShutdown: { History: true, Locked: true },
+    },
+  });
+  await checkPrivacyPreferences(ALL_DISABLED);
+});
+
+add_task(async function test_sanitizeOnShutdown_object_locked_false() {
+  await setupPolicyEngineWithJson({
+    policies: {
+      SanitizeOnShutdown: { History: true, Locked: false },
+    },
+  });
+  await checkPrivacyPreferences(NONE_DISABLED);
+});

browser/components/preferences/config/privacy.mjs

@@ -2882,9 +2882,13 @@ Preferences.addSetting({
       });
     }
   },
-  disabled({ privateBrowsingAutoStart }) {
-    // Disable history dropdown if PBM autostart is locked on.
-    return privateBrowsingAutoStart.locked && privateBrowsingAutoStart.value;
+  disabled({ privateBrowsingAutoStart, sanitizeOnShutdown }) {
+    // Disable history dropdown if PBM autostart is locked on, or if
+    // SanitizeOnShutdown policy locks clear-on-shutdown on (forces "custom").
+    return (
+      (privateBrowsingAutoStart.locked && privateBrowsingAutoStart.value) ||
+      (sanitizeOnShutdown.locked && sanitizeOnShutdown.value)
+    );
   },
   getControlConfig(config, { privateBrowsingAutoStart }, setting) {
     let l10nId = null;
@@ -2938,6 +2942,9 @@ Preferences.addSetting({
   visible({ historyMode }) {
     return PrivateBrowsingUtils.enabled && historyMode.value == "custom";
   },
+  disabled({ historyMode }) {
+    return historyMode.disabled;
+  },
 });
 Preferences.addSetting({
   id: "rememberHistory",
@@ -2968,8 +2975,8 @@ Preferences.addSetting({
   visible({ historyMode }) {
     return historyMode.value == "custom";
   },
-  disabled({ privateBrowsingAutoStart }) {
-    return privateBrowsingAutoStart.value;
+  disabled({ privateBrowsingAutoStart, historyMode }) {
+    return privateBrowsingAutoStart.value || historyMode.disabled;
   },
 });