diff --git a/browser/components/sessionstore/test/browser.toml b/browser/components/sessionstore/test/browser.toml index c7b19a08e8c4..bba3bb11347a 100644 --- a/browser/components/sessionstore/test/browser.toml +++ b/browser/components/sessionstore/test/browser.toml @@ -37,6 +37,8 @@ prefs = [ "gfx.font_rendering.fallback.async=false", "browser.sessionstore.closedTabsFromAllWindows=true", "browser.sessionstore.closedTabsFromClosedWindows=true", + # Override the test default, allowing the session restore infobar to be shown if necessary + "browser.startup.couldRestoreSession.count=0", ] ["browser_aboutPrivateBrowsing.js"] diff --git a/testing/profiles/base/user.js b/testing/profiles/base/user.js index 8cd26eddb2e1..2369a0b05ca8 100644 --- a/testing/profiles/base/user.js +++ b/testing/profiles/base/user.js @@ -13,4 +13,8 @@ user_pref("dom.input_events.security.minTimeElapsedInMS", 0); user_pref("extensions.formautofill.addresses.experiments.enabled", true); // Turn off update -user_pref("app.update.disabledForTesting", true); \ No newline at end of file +user_pref("app.update.disabledForTesting", true); + +// Browser restarts can cause the session restore suggestion to be shown when reusing a +// profile across a set of tests. Avoid showing this infobar by default. +user_pref("browser.startup.couldRestoreSession.count", -1); \ No newline at end of file diff --git a/testing/profiles/perf/user.js b/testing/profiles/perf/user.js index b0f32c08fc3a..f0e493dd1a87 100644 --- a/testing/profiles/perf/user.js +++ b/testing/profiles/perf/user.js @@ -32,7 +32,6 @@ user_pref("browser.safebrowsing.provider.google4.updateURL", "http://127.0.0.1/s user_pref("browser.safebrowsing.provider.mozilla.gethashURL", "http://127.0.0.1/safebrowsing-dummy/gethash"); user_pref("browser.safebrowsing.provider.mozilla.updateURL", "http://127.0.0.1/safebrowsing-dummy/update"); user_pref("browser.shell.checkDefaultBrowser", false); -user_pref("browser.startup.couldRestoreSession.count", -1); user_pref("browser.warnOnQuit", false); user_pref("datareporting.healthreport.documentServerURI", "http://127.0.0.1/healthreport/"); user_pref("devtools.chrome.enabled", false); diff --git a/testing/profiles/web-platform/user.js b/testing/profiles/web-platform/user.js index 843d1492b0d5..e50aabc01904 100644 --- a/testing/profiles/web-platform/user.js +++ b/testing/profiles/web-platform/user.js @@ -8,8 +8,6 @@ user_pref("browser.newtabpage.enabled", false); // Don't restore the last open set of tabs if the browser has crashed user_pref("browser.sessionstore.resume_from_crash", false); -// Disable session restore infobar. -user_pref("browser.startup.couldRestoreSession.count", -1); // Don't show the Bookmarks Toolbar on any tab (the above pref that // disables the New Tab Page ends up showing the toolbar on about:blank). user_pref("browser.toolbars.bookmarks.visibility", "never");