Backout 0e6aa605af74 (bug 1140263) now that Adobe EME is cleared to be turned on for Windows Vista and above. r=me
authorStephen Pohl <spohl.mozilla.bugs@gmail.com>
Sun, 22 Mar 2015 23:26:26 -0400
changeset 265278 a9f983fdb8a45352fe1e9f9dbee6395a8cca3f5d
parent 265271 e730012260a437b2aa0a018f99f70de682d58f66
child 265279 06f13b15a69ba75bebae7b8fc91e7c79d583b011
child 265329 337e3aa22117505a66e42628d7eb0f43a8e1e7fa
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1140263
milestone39.0a1
backs out0e6aa605af74fc735eac425dbd58561994342d82
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout 0e6aa605af74 (bug 1140263) now that Adobe EME is cleared to be turned on for Windows Vista and above. r=me
toolkit/modules/GMPUtils.jsm
toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
--- a/toolkit/modules/GMPUtils.jsm
+++ b/toolkit/modules/GMPUtils.jsm
@@ -42,17 +42,21 @@ this.GMPUtils = {
 
   /**
    * Checks whether or not a given plugin is supported by the current OS.
    * @param   aPlugin
    *          The plugin to check.
    */
   _isPluginSupported: function(aPlugin) {
     if (aPlugin.id == EME_ADOBE_ID) {
-      return false;
+      if (Services.appinfo.OS == "WINNT") {
+        return Services.sysinfo.getPropertyAsInt32("version") >= 6;
+      } else {
+        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.
    * @param   aPlugin
--- a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
@@ -370,18 +370,23 @@ add_task(function* testEmeSupport() {
   yield GMPScope.GMPProvider.shutdown();
   GMPScope.GMPProvider.startup();
 
   for (let addon of gMockAddons) {
     yield gCategoryUtilities.openType("plugin");
     let doc = gManagerWindow.document;
     let item = get_addon_element(gManagerWindow, addon.id);
     if (addon.id == GMPScope.EME_ADOBE_ID) {
-      Assert.ok(!item,
-                "Adobe EME not supported, couldn't find add-on element.");
+      if (Services.appinfo.OS == "WINNT" &&
+          Services.sysinfo.getPropertyAsInt32("version") >= 6) {
+        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 {
       Assert.ok(item, "Found add-on element.");
     }
   }
 
   for (let addon of gMockAddons) {
     gPrefs.setBoolPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_FORCEVISIBLE, addon.id),
                        true);