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

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

Author: mkaply

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

@@ -120,6 +120,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,83 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+async function checkPrivacyPreferences({
+  historyMode,
+  privateBrowsingAutoStart,
+  alwaysClear,
+  rememberHistory,
+  rememberForms,
+}) {
+  await BrowserTestUtils.withNewTab(
+    "about:preferences#privacy",
+    async browser => {
+      let doc = browser.contentDocument;
+      let checks = {
+        historyMode,
+        privateBrowsingAutoStart,
+        alwaysClear,
+        rememberHistory,
+        rememberForms,
+      };
+      for (let [id, expected] of Object.entries(checks)) {
+        if (expected === undefined) {
+          continue;
+        }
+        is(doc.getElementById(id).disabled, expected, `#${id} disabled state`);
+      }
+    }
+  );
+}
+
+add_task(async function test_sanitizeOnShutdown_boolean_true() {
+  await setupPolicyEngineWithJson({
+    policies: {
+      SanitizeOnShutdown: true,
+    },
+  });
+  await checkPrivacyPreferences({
+    historyMode: true,
+    privateBrowsingAutoStart: true,
+    alwaysClear: true,
+    rememberHistory: false,
+    rememberForms: false,
+  });
+});
+
+add_task(async function test_sanitizeOnShutdown_object_locked_true() {
+  await setupPolicyEngineWithJson({
+    policies: {
+      SanitizeOnShutdown: {
+        History: true,
+        Locked: true,
+      },
+    },
+  });
+  await checkPrivacyPreferences({
+    historyMode: true,
+    privateBrowsingAutoStart: true,
+    alwaysClear: true,
+    rememberHistory: false,
+    rememberForms: false,
+  });
+});
+
+add_task(async function test_sanitizeOnShutdown_object_locked_false() {
+  await setupPolicyEngineWithJson({
+    policies: {
+      SanitizeOnShutdown: {
+        History: true,
+        Locked: false,
+      },
+    },
+  });
+  await checkPrivacyPreferences({
+    historyMode: false,
+    privateBrowsingAutoStart: false,
+    alwaysClear: false,
+    rememberHistory: false,
+    rememberForms: false,
+  });
+});

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;
   },
 });