tor-browser

commit 2674356a3e766da4dc1d077a04b86737970c6652
parent baae844df37261b46795b9baaff39883a6bde9e6
Author: Serban Stanca <sstanca@mozilla.com>
Date:   Thu, 23 Oct 2025 17:39:20 +0300

Revert "Bug 1995651 - Disable backup for users who have sanitizeOnShutdown turned on. r=fchasen" for causing mochitests failures in rowser/browser_settings.js.

This reverts commit c2c74067f0488ba9da72bbb84cb28ae8dd951669.

Diffstat:
M
browser/components/backup/BackupService.sys.mjs
 | 
22
----------------------
M
browser/components/backup/tests/browser/browser_settings.js
 | 
52
+++++++++++++++++++++-------------------------------

2 files changed, 21 insertions(+), 53 deletions(-)
diff --git a/browser/components/backup/BackupService.sys.mjs b/browser/components/backup/BackupService.sys.mjs
@@ -627,13 +627,6 @@ export class BackupService extends EventTarget {
       };
     }
 
-    if (Services.prefs.getBoolPref("privacy.sanitize.sanitizeOnShutdown")) {
-      return {
-        enabled: false,
-        reason: "Backup is disabled for users with sanitizeOnShutdown enabled.",
-      };
-    }
-
     return { enabled: true };
   }
 
@@ -660,13 +653,6 @@ export class BackupService extends EventTarget {
       };
     }
 
-    if (Services.prefs.getBoolPref("privacy.sanitize.sanitizeOnShutdown")) {
-      return {
-        enabled: false,
-        reason: "Backup is disabled for users with sanitizeOnShutdown enabled.",
-      };
-    }
-
     return { enabled: true };
   }
 
@@ -3682,10 +3668,6 @@ export class BackupService extends EventTarget {
       BACKUP_RESTORE_ENABLED_PREF_NAME,
       this.#notifyStatusObservers
     );
-    Services.prefs.addObserver(
-      "privacy.sanitize.sanitizeOnShutdown",
-      this.#notifyStatusObservers
-    );
     lazy.NimbusFeatures.backupService.onUpdate(this.#notifyStatusObservers);
   }
 
@@ -3698,10 +3680,6 @@ export class BackupService extends EventTarget {
       BACKUP_RESTORE_ENABLED_PREF_NAME,
       this.#notifyStatusObservers
     );
-    Services.prefs.removeObserver(
-      "privacy.sanitize.sanitizeOnShutdown",
-      this.#notifyStatusObservers
-    );
   }
 
   /**
diff --git a/browser/components/backup/tests/browser/browser_settings.js b/browser/components/backup/tests/browser/browser_settings.js
@@ -26,8 +26,6 @@ add_task(async function test_preferences_visibility() {
   await BrowserTestUtils.withNewTab("about:preferences#sync", async browser => {
     let backupSection =
       browser.contentDocument.querySelector("#dataBackupGroup");
-
-    let settings = browser.contentDocument.querySelector("backup-settings");
     Assert.ok(backupSection, "Found backup preferences section");
 
     // Our mochitest-browser tests are configured to have the section visible
@@ -36,34 +34,23 @@ add_task(async function test_preferences_visibility() {
       BrowserTestUtils.isVisible(backupSection),
       "Backup section is visible"
     );
+  });
 
-    await SpecialPowers.pushPrefEnv({
-      set: [["privacy.sanitize.sanitizeOnShutdown", true]],
-    });
-
-    Assert.ok(
-      !settings.restoreFromBackupEl,
-      "Backup Restore section is not available"
-    );
-
-    Assert.ok(
-      BrowserTestUtils.isHidden(backupSection),
-      "Backup section is now hidden"
-    );
-
-    await SpecialPowers.popPrefEnv();
-
-    await SpecialPowers.pushPrefEnv({
-      set: [[BACKUP_ARCHIVE_ENABLED_PREF, false]],
-    });
+  await SpecialPowers.pushPrefEnv({
+    set: [[BACKUP_ARCHIVE_ENABLED_PREF, false]],
+  });
 
-    await settings.updateComplete;
+  await BrowserTestUtils.withNewTab("about:preferences#sync", async browser => {
+    let backupSection =
+      browser.contentDocument.querySelector("#dataBackupGroup");
+    Assert.ok(backupSection, "Found backup preferences section");
 
     Assert.ok(
       BrowserTestUtils.isVisible(backupSection),
-      "Backup section is now visible"
+      "Backup section is still visible"
     );
 
+    let settings = browser.contentDocument.querySelector("backup-settings");
     let backupArchiveSection = settings.querySelector("#scheduled-backups");
 
     Assert.ok(!backupArchiveSection, "Backup archive section is not available");
@@ -72,24 +59,27 @@ add_task(async function test_preferences_visibility() {
       settings.restoreFromBackupEl,
       "Backup restore section is available"
     );
-
-    await SpecialPowers.pushPrefEnv({
-      set: [[BACKUP_RESTORE_ENABLED_PREF, false]],
-    });
-
+  });
+  await SpecialPowers.pushPrefEnv({
+    set: [[BACKUP_RESTORE_ENABLED_PREF, false]],
+  });
+  await BrowserTestUtils.withNewTab("about:preferences#sync", async browser => {
+    let settings = browser.contentDocument.querySelector("backup-settings");
     Assert.ok(
       !settings.restoreFromBackupEl,
       "Backup Restore section is not available"
     );
 
+    let backupSection =
+      browser.contentDocument.querySelector("#dataBackupGroup");
     Assert.ok(
       BrowserTestUtils.isHidden(backupSection),
       "Backup section is now hidden"
     );
-
-    await SpecialPowers.popPrefEnv();
-    await SpecialPowers.popPrefEnv();
   });
+
+  await SpecialPowers.popPrefEnv();
+  await SpecialPowers.popPrefEnv();
 });
 
 /**