Bug 1107372 - Rework SafeBrowsing prefs for multiple providers. r=jmaher
authorGian-Carlo Pascutto <gcp@mozilla.com>
Tue, 01 Sep 2015 16:49:39 +0200
changeset 1009 3b94adbd66f1
parent 1008 3fa2c76a3fb7
child 1010 c0de097a7159
push id698
push usergpascutto@mozilla.com
push dateThu, 03 Sep 2015 13:33:15 +0000
reviewersjmaher
bugs1107372
Bug 1107372 - Rework SafeBrowsing prefs for multiple providers. r=jmaher
talos/config.py
--- a/talos/config.py
+++ b/talos/config.py
@@ -208,25 +208,23 @@ DEFAULTS = dict(
         'toolkit.telemetry.notifiedOptOut': 999,
         'dom.send_after_paint_to_content': True,
         'security.turn_off_all_security_so_that_viruses_can_'
         'take_over_this_computer': True,
         'browser.newtabpage.directory.source':
             '${webserver}/directoryLinks.json',
         'browser.newtabpage.directory.ping': '',
         'browser.newtabpage.introShown': True,
-        'browser.safebrowsing.gethashURL':
+        'browser.safebrowsing.provider.google.gethashURL':
             'http://127.0.0.1/safebrowsing-dummy/gethash',
-        'browser.safebrowsing.keyURL':
-            'http://127.0.0.1/safebrowsing-dummy/newkey',
-        'browser.safebrowsing.updateURL':
+        'browser.safebrowsing.provider.google.updateURL':
             'http://127.0.0.1/safebrowsing-dummy/update',
-        'browser.trackingprotection.gethashURL':
+        'browser.safebrowsing.provider.mozilla.gethashURL':
             'http://127.0.0.1/safebrowsing-dummy/gethash',
-        'browser.trackingprotection.updateURL':
+        '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.search.isUS': True,
         'browser.search.countryCode': 'US',
         'browser.selfsupport.url':