Bug 1136707 - [Part2] Remove the pref 'media.eme.clearkey.enabled' in browser. r=Gijs
authorKilik Kuo <kikuo@mozilla.com>
Wed, 27 Jul 2016 12:05:00 +0800
changeset 331896 48be91b202107da09bf5e6888f6563155f10f8a3
parent 331895 d8c5236bbb9dd314c0838cb08847b5cae589d5f6
child 331897 2fefec564929ded72295da4433196e4e0f587f61
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs1136707
milestone50.0a1
Bug 1136707 - [Part2] Remove the pref 'media.eme.clearkey.enabled' in browser. r=Gijs MozReview-Commit-ID: LsUdsFOaJlz
browser/base/content/browser-media.js
--- a/browser/base/content/browser-media.js
+++ b/browser/base/content/browser-media.js
@@ -14,20 +14,16 @@ var gEMEHandler = {
   },
   ensureEMEEnabled: function(browser, keySystem) {
     Services.prefs.setBoolPref("media.eme.enabled", true);
     if (keySystem) {
       if (keySystem.startsWith("com.adobe") &&
           Services.prefs.getPrefType("media.gmp-eme-adobe.enabled") &&
           !Services.prefs.getBoolPref("media.gmp-eme-adobe.enabled")) {
         Services.prefs.setBoolPref("media.gmp-eme-adobe.enabled", true);
-      } else if (keySystem == "org.w3.clearkey" &&
-                 Services.prefs.getPrefType("media.eme.clearkey.enabled") &&
-                 !Services.prefs.getBoolPref("media.eme.clearkey.enabled")) {
-        Services.prefs.setBoolPref("media.eme.clearkey.enabled", true);
       } else if (keySystem == "com.widevine.alpha" &&
                  Services.prefs.getPrefType("media.gmp-widevinecdm.enabled") &&
                  !Services.prefs.getBoolPref("media.gmp-widevinecdm.enabled")) {
         Services.prefs.setBoolPref("media.gmp-widevinecdm.enabled", true);
       }
     }
     browser.reload();
   },