[tor-commits] [tor-browser/tor-browser-52.1.0esr-7.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.

[gk at torproject.org]

commit 726b6d699e101570b14e3eb091ec94e9d5ee1946
Author: Georg Koppen <gk at torproject.org>
Date:   Mon May 22 12:52:09 2017 +0000

    fixup! TB4: Tor Browser's Firefox preference overrides.
    
    Adapt preferences to take new EME related ones into account.
---
 browser/app/profile/000-tor-browser.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 7b0ad71..53d1ac2 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -228,12 +228,15 @@ pref("media.gmp-manager.url.override", "data:text/plain,");
 // server. There is a local fallback that must be blocked now as well. See:
 // https://bugzilla.mozilla.org/show_bug.cgi?id=1267495.
 pref("media.gmp-manager.updateEnabled", false);
-// EME prefs: Strictly speaking these prefs don't need to be set as we are
-// using the --disable-eme compile flag. However, in order to not confuse users,
-// who might stumble upon them while looking into about:config, we set them to
-// 'false' communicating that EME is really disabled.
+// Mozilla is relying on preferences to make sure no DRM blob is downloaded and
+// run. Even though those prefs should be set correctly by specifying
+// --disable-eme (which we do), we disable all of them here as well for defense
+// in depth.
 pref("browser.eme.ui.enabled", false);
+pref("media.gmp-eme-adobe.visible", false);
 pref("media.gmp-eme-adobe.enabled", false);
+pref("media.gmp-widevinecdm.visible", false);
+pref("media.gmp-widevinecdm.enabled", false);
 pref("media.eme.enabled", false);
 pref("media.eme.apiVisible", false);
 // WebIDE can bypass proxy settings for remote debugging. It also downloads