merge fx-team to mozilla-central a=merge
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 23 Mar 2015 13:07:29 +0100
changeset 263817 06f13b15a69ba75bebae7b8fc91e7c79d583b011
parent 263815 678b074e9e3e8e582c6c5cb6305d4c0ab6c27f67 (current diff)
parent 263816 a9f983fdb8a45352fe1e9f9dbee6395a8cca3f5d (diff)
child 263866 bc85c479668a86c0851bfbf9992ab78fcc51c479
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone39.0a1
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
merge fx-team to mozilla-central a=merge
--- 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);