[tor-commits] [tor-browser/tor-browser-38.4.0esr-5.5-1] Bug 16441: Suppress "Reset Tor Browser" prompt.

[gk at torproject.org]

commit 549d97d99b477b1764bb4875a964c0dbc6d694e3
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Thu Dec 10 16:42:49 2015 -0500

    Bug 16441: Suppress "Reset Tor Browser" prompt.
---
 browser/app/profile/000-tor-browser.js |    3 +++
 tbb-tests/browser_tor_TB4.js           |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index dc38ee4..4205b4b 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -27,6 +27,9 @@ pref("browser.slowStartup.notificationDisabled", true);
 pref("browser.slowStartup.maxSamples", 0);
 pref("browser.slowStartup.samples", 0);
 
+// Disable the "Refresh" prompt that is displayed for stale profiles.
+pref("browser.disableResetPrompt", true);
+
 // Disk activity: Disable Browsing History Storage
 pref("browser.privatebrowsing.autostart", true);
 pref("browser.cache.disk.enable", false);
diff --git a/tbb-tests/browser_tor_TB4.js b/tbb-tests/browser_tor_TB4.js
index 00a5fc0..6defb92 100644
--- a/tbb-tests/browser_tor_TB4.js
+++ b/tbb-tests/browser_tor_TB4.js
@@ -17,6 +17,9 @@ let expectedPrefs = [
    ["startup.homepage_welcome_url", ""],
    ["startup.homepage_override_url", ""],
 
+   // Disable the "Refresh" prompt that is displayed for stale profiles.
+   ["browser.disableResetPrompt", true],
+
    // Disk activity: Disable Browsing History Storage
    ["browser.privatebrowsing.autostart", true],
    ["browser.cache.disk.enable", false],
@@ -175,7 +178,7 @@ let getPref = function (prefName) {
   if (type === gPrefService.PREF_BOOL) return gPrefService.getBoolPref(prefName);
   if (type === gPrefService.PREF_STRING) return gPrefService.getCharPref(prefName);
   // Something went wrong.
-  throw new Error("Can't access pref.");
+  throw new Error("Can't access pref " + prefName);
 };
 
 let testPref = function([key, expectedValue]) {