Bug 1089867: Rename media.eme.adobe-access.enabled pref to media.gmp-eme-adobe.enabled. r=cpearce a=lmandel
authorStephen Pohl <spohl.mozilla.bugs@gmail.com>
Tue, 17 Feb 2015 12:50:16 -0500
changeset 250219 9b9911bc6bd5
parent 250218 d8e655d11fc5
child 250220 f0b35fc2bfbf
push id4521
push usercpearce@mozilla.com
push date2015-03-04 01:22 +0000
treeherdermozilla-beta@8abdbdecd2d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce, lmandel
bugs1089867
milestone37.0
Bug 1089867: Rename media.eme.adobe-access.enabled pref to media.gmp-eme-adobe.enabled. r=cpearce a=lmandel
dom/media/eme/MediaKeySystemAccess.cpp
--- a/dom/media/eme/MediaKeySystemAccess.cpp
+++ b/dom/media/eme/MediaKeySystemAccess.cpp
@@ -116,17 +116,17 @@ MediaKeySystemAccess::GetKeySystemStatus
 
 #ifdef XP_WIN
   if ((aKeySystem.EqualsLiteral("com.adobe.access") ||
        aKeySystem.EqualsLiteral("com.adobe.primetime"))) {
     // Win Vista and later only.
     if (!IsVistaOrLater()) {
       return MediaKeySystemStatus::Cdm_not_supported;
     }
-    if (!Preferences::GetBool("media.eme.adobe-access.enabled", false)) {
+    if (!Preferences::GetBool("media.gmp-eme-adobe.enabled", false)) {
       return MediaKeySystemStatus::Cdm_disabled;
     }
     if (!HaveGMPFor(mps,
                     NS_ConvertUTF16toUTF8(aKeySystem),
                     NS_LITERAL_CSTRING(GMP_API_DECRYPTOR))) {
       return MediaKeySystemStatus::Cdm_not_installed;
     }
     return MediaKeySystemStatus::Available;