Bug 1234099 - Unhide Adobe GMP on Windows XP. r=spohl
authorChris Pearce <cpearce@mozilla.com>
Wed, 24 Feb 2016 15:46:52 +1300
changeset 321707 268f6f3364fdec329169a35d80462bb8637dd65b
parent 321706 5043859cda390cc0498e80fc09d90783c991a848
child 321708 889072501f26d2e89e3d3552e7b4fad79cbffb75
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersspohl
bugs1234099
milestone47.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
Bug 1234099 - Unhide Adobe GMP on Windows XP. r=spohl MozReview-Commit-ID: FIdyL7l3eY6
toolkit/modules/GMPUtils.jsm
toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
--- a/toolkit/modules/GMPUtils.jsm
+++ b/toolkit/modules/GMPUtils.jsm
@@ -76,24 +76,16 @@ this.GMPUtils = {
     if (Services.appinfo.OS != "WINNT") {
       // Non-Windows OSes currently unsupported.
       this.maybeReportTelemetry(aPlugin.id,
                                 "VIDEO_EME_ADOBE_UNSUPPORTED_REASON",
                                 GMPPluginUnsupportedReason.NOT_WINDOWS);
       return false;
     }
 
-    if (Services.sysinfo.getPropertyAsInt32("version") < 6) {
-      // Windows versions before Vista are unsupported.
-      this.maybeReportTelemetry(aPlugin.id,
-                                "VIDEO_EME_ADOBE_UNSUPPORTED_REASON",
-                                GMPPluginUnsupportedReason.WINDOWS_VERSION);
-      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
    *          The plugin to check.
--- a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
@@ -373,18 +373,17 @@ 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) {
-      if (Services.appinfo.OS == "WINNT" &&
-          Services.sysinfo.getPropertyAsInt32("version") >= 6) {
+      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 {
       Assert.ok(item, "Found add-on element.");
     }