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

[gk at torproject.org]

commit b34d1fabc03309cd347070fa79c99c2534bd1650
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Mon Sep 30 22:10:26 2019 +0000

    fixup! TB4: Tor Browser's Firefox preference overrides.
    
    Bug 16285 - Disable DRM/EME on Android and drop Adobe CDM
---
 browser/app/profile/000-tor-browser.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 1b936a3beb3d..93a661a894cb 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -215,14 +215,13 @@ pref("media.gmp-manager.updateEnabled", false);
 // 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.
+// in depth (see bug 16285 for more details).
 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);
+pref("media.mediadrm-widevinecdm.visible", false);
 // WebIDE can bypass proxy settings for remote debugging. It also downloads
 // some additional addons that we have not reviewed. Turn all that off.
 pref("devtools.webide.autoinstallADBHelper", false);