Bug 1259288 - Safe Browsing should be fully disabled in our test suites. r?gcp
MozReview-Commit-ID: 2og99Gl9w9n
--- a/js/src/tests/user.js
+++ b/js/src/tests/user.js
@@ -20,13 +20,16 @@ user_pref("extensions.checkUpdateSecurit
user_pref("browser.EULA.override", true);
user_pref("javascript.options.strict", false);
user_pref("javascript.options.werror", false);
user_pref("toolkit.startup.max_resumed_crashes", -1);
user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_computer", true);
user_pref("toolkit.telemetry.enabled", false);
user_pref("browser.safebrowsing.enabled", false);
user_pref("browser.safebrowsing.malware.enabled", false);
+user_pref("browser.safebrowsing.forbiddenURIs.enabled", false);
+user_pref("privacy.trackingprotection.enabled", false);
+user_pref("privacy.trackingprotection.pbmode.enabled", false);
user_pref("browser.snippets.enabled", false);
user_pref("browser.snippets.syncPromo.enabled", false);
user_pref("browser.snippets.firstrunHomepage.enabled", false);
user_pref("general.useragent.updates.enabled", false);
user_pref("browser.webapps.checkForUpdates", 0);
--- a/layout/tools/reftest/reftest-preferences.js
+++ b/layout/tools/reftest/reftest-preferences.js
@@ -76,16 +76,17 @@ user_pref("security.view-source.reachabl
// Ensure that telemetry is disabled, so we don't connect to the telemetry
// server in the middle of the tests.
user_pref("toolkit.telemetry.enabled", false);
user_pref("toolkit.telemetry.unified", false);
// Likewise for safebrowsing.
user_pref("browser.safebrowsing.enabled", false);
user_pref("browser.safebrowsing.malware.enabled", false);
+user_pref("browser.safebrowsing.forbiddenURIs.enabled", false);
// Likewise for tracking protection.
user_pref("privacy.trackingprotection.enabled", false);
user_pref("privacy.trackingprotection.pbmode.enabled", false);
// And for snippets.
user_pref("browser.snippets.enabled", false);
user_pref("browser.snippets.syncPromo.enabled", false);
user_pref("browser.snippets.firstrunHomepage.enabled", false);
// And for useragent updates.
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -197,30 +197,33 @@ class DesktopInstance(GeckoInstance):
'app.update.enabled': False,
'browser.dom.window.dump.enabled': True,
# Bug 1145668 - Has to be reverted to about:blank once Marionette
# can correctly handle error pages
'browser.newtab.url': 'about:newtab',
'browser.newtabpage.enabled': False,
'browser.reader.detectedFirstArticle': True,
'browser.safebrowsing.enabled': False,
+ 'browser.safebrowsing.forbiddenURIs.enabled': False,
'browser.safebrowsing.malware.enabled': False,
'browser.search.update': False,
'browser.tabs.animate': False,
'browser.tabs.warnOnClose': False,
'browser.tabs.warnOnOpen': False,
'browser.uitour.enabled': False,
'dom.report_all_js_exceptions': True,
'extensions.getAddons.cache.enabled': False,
'extensions.installDistroAddons': False,
'extensions.showMismatchUI': False,
'extensions.update.enabled': False,
'extensions.update.notifyUser': False,
'geo.provider.testing': True,
'javascript.options.showInConsole': True,
+ 'privacy.trackingprotection.enabled': False,
+ 'privacy.trackingprotection.pbmode.enabled': False,
'security.notification_enable_delay': 0,
'signon.rememberSignons': False,
'toolkit.startup.max_resumed_crashes': -1,
}
def __init__(self, *args, **kwargs):
super(DesktopInstance, self).__init__(*args, **kwargs)
self.required_prefs.update(DesktopInstance.desktop_prefs)
--- a/testing/talos/talos/config.py
+++ b/testing/talos/talos/config.py
@@ -104,16 +104,19 @@ DEFAULTS = dict(
'browser.safebrowsing.provider.mozilla.gethashURL':
'http://127.0.0.1/safebrowsing-dummy/gethash',
'browser.safebrowsing.provider.mozilla.updateURL':
'http://127.0.0.1/safebrowsing-dummy/update',
'privacy.trackingprotection.introURL':
'http://127.0.0.1/trackingprotection/tour',
'browser.safebrowsing.enabled': False,
'browser.safebrowsing.malware.enabled': False,
+ 'browser.safebrowsing.forbiddenURIs.enabled': False,
+ 'privacy.trackingprotection.enabled': False,
+ 'privacy.trackingprotection.pbmode.enabled': False,
'browser.search.isUS': True,
'browser.search.countryCode': 'US',
'browser.selfsupport.url':
'https://127.0.0.1/selfsupport-dummy/',
'extensions.update.url':
'http://127.0.0.1/extensions-dummy/updateURL',
'extensions.update.background.url':
'http://127.0.0.1/extensions-dummy/updateBackgroundURL',