Bug 1329547 - Remove messages about missing CDM on XP. r?gijs draft
authorChris Peterson <cpeterson@mozilla.com>
Sun, 08 Jan 2017 00:43:12 -0800
changeset 457483 d424cb53de6bb2e91d7931f4dded9148aed75e29
parent 457482 7bc61992c7c528b271ffb57e1833a64cc88d5215
child 541487 707ef0952083b2d22ae2563526d66cebe74f6f3c
push id40783
push usercpeterson@mozilla.com
push dateMon, 09 Jan 2017 02:19:02 +0000
reviewersgijs
bugs1329547
milestone53.0a1
Bug 1329547 - Remove messages about missing CDM on XP. r?gijs MozReview-Commit-ID: nTEgsecM8h
browser/base/content/browser-media.js
browser/base/content/test/general/browser_decoderDoctor.js
--- a/browser/base/content/browser-media.js
+++ b/browser/base/content/browser-media.js
@@ -198,20 +198,16 @@ const TELEMETRY_DDSTAT_SHOWN_FIRST = 1;
 const TELEMETRY_DDSTAT_CLICKED = 2;
 const TELEMETRY_DDSTAT_CLICKED_FIRST = 3;
 const TELEMETRY_DDSTAT_SOLVED = 4;
 
 let gDecoderDoctorHandler = {
   getLabelForNotificationBox(type) {
     if (type == "adobe-cdm-not-found" &&
         AppConstants.platform == "win") {
-      if (AppConstants.isPlatformAndVersionAtMost("win", "5.9")) {
-        // We supply our own Learn More button so we don't need to populate the message here.
-        return gNavigatorBundle.getFormattedString("emeNotifications.drmContentDisabled.message", [""]);
-      }
       return gNavigatorBundle.getString("decoder.noCodecs.message");
     }
     if (type == "adobe-cdm-not-activated" &&
         AppConstants.platform == "win") {
       if (!AppConstants.isPlatformAndVersionAtLeast("win", "6.1")) {
         return gNavigatorBundle.getString("decoder.noCodecsVista.message");
       }
       return gNavigatorBundle.getString("decoder.noCodecs.message");
--- a/browser/base/content/test/general/browser_decoderDoctor.js
+++ b/browser/base/content/test/general/browser_decoderDoctor.js
@@ -47,23 +47,17 @@ function* test_decoder_doctor_notificati
 }
 
 add_task(function* test_adobe_cdm_not_found() {
   // This is only sent on Windows.
   if (AppConstants.platform != "win") {
     return;
   }
 
-  let message;
-  if (AppConstants.isPlatformAndVersionAtMost("win", "5.9")) {
-    message = gNavigatorBundle.getFormattedString("emeNotifications.drmContentDisabled.message", [""]);
-  } else {
-    message = gNavigatorBundle.getString("decoder.noCodecs.message");
-  }
-
+  let message = gNavigatorBundle.getString("decoder.noCodecs.message");
   yield test_decoder_doctor_notification("adobe-cdm-not-found", message);
 });
 
 add_task(function* test_adobe_cdm_not_activated() {
   // This is only sent on Windows.
   if (AppConstants.platform != "win") {
     return;
   }