Bug 1264879 - Widevine hidden in Linux draft
authorKirk Steuber <ksteuber@mozilla.com>
Fri, 15 Apr 2016 09:57:37 -0700
changeset 352094 3eb239b7a48c26beab1858bc10ec94a360eb1c1a
parent 351027 b18627f168147e1dc52c5eb8a9a5e956f627d5b3
child 518575 55f96ca20f84f29a4d69e8dda2420c132eed4d26
push id15612
push userksteuber@mozilla.com
push dateFri, 15 Apr 2016 17:06:12 +0000
bugs1264879
milestone48.0a1
Bug 1264879 - Widevine hidden in Linux MozReview-Commit-ID: JHUjnXUOXFO
toolkit/modules/GMPUtils.jsm
toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
--- a/toolkit/modules/GMPUtils.jsm
+++ b/toolkit/modules/GMPUtils.jsm
@@ -79,16 +79,19 @@ this.GMPUtils = {
         return false;
       }
     } else if (aPlugin.id == WIDEVINE_ID) {
       if (Services.appinfo.OS == "WINNT" &&
           Services.sysinfo.getPropertyAsInt32("version") < 6) {
         // Windows versions before Vista are unsupported by Widevine
         return false;
       }
+      if (Services.appinfo.OS == "Linux") {
+        return false;
+      }
     }
 
     return true;
   },
 
   /**
    * Checks whether or not a given plugin is forced visible. This can be used
    * to test plugins that aren't yet supported by default on a particular OS.
--- a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
@@ -381,18 +381,19 @@ add_task(function* testEmeSupport() {
     if (addon.id == GMPScope.EME_ADOBE_ID) {
       if (Services.appinfo.OS == "WINNT") {
         Assert.ok(item, "Adobe EME supported, found add-on element.");
       } else {
         Assert.ok(!item,
                   "Adobe EME not supported, couldn't find add-on element.");
       }
     } else if (addon.id == GMPScope.WIDEVINE_ID) {
-      if (Services.appinfo.OS == "WINNT" &&
-          Services.sysinfo.getPropertyAsInt32("version") < 6) {
+      if ((Services.appinfo.OS == "WINNT" &&
+          Services.sysinfo.getPropertyAsInt32("version") < 6) ||
+          Services.appinfo.OS == "Linux") {
         Assert.ok(!item,
                   "Widevine not supported, couldn't find add-on element.");
       } else {
         Assert.ok(item, "Widevine supported, found add-on element.");
       }
     } else {
       Assert.ok(item, "Found add-on element.");
     }