Merge mozilla-central to mozilla-inbound

2016-07-16 10:13:13 +02:00 · 2016-07-16 10:13:13 +02:00 · ebc26445fb
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@ -5121,7 +5121,7 @@ pref("browser.safebrowsing.reportPhishURL", "https://%LOCALE%.phish-report.mozil
 pref("browser.safebrowsing.reportMalwareMistakeURL", "https://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%&url=");

 // The table and global pref for blocking plugin content
-pref("browser.safebrowsing.blockedURIs.enabled", true);
+pref("browser.safebrowsing.blockedURIs.enabled", false);
 pref("urlclassifier.blockedTable", "test-block-simple,mozplugin-block-digest256");

 // The protocol version we communicate with mozilla server.