Bug 1309463 - Fix check for supported EME platforms. r=mconley
authorDale Harvey <dale@arandomurl.com>
Thu, 20 Oct 2016 21:17:50 +0100
changeset 427719 4ec817d1c6ce278ba954afdcfff2fe4697f00eee
parent 427718 e02e34d291ca4f16caf687bd14d5fbc5081453f0
child 427720 35f88c160489ddf0c8db02a25c4816cffcf7e65d
push id33099
push userdholbert@mozilla.com
push dateThu, 20 Oct 2016 20:25:54 +0000
reviewersmconley
bugs1309463
milestone52.0a1
Bug 1309463 - Fix check for supported EME platforms. r=mconley
toolkit/modules/GMPInstallManager.jsm
--- a/toolkit/modules/GMPInstallManager.jsm
+++ b/toolkit/modules/GMPInstallManager.jsm
@@ -34,28 +34,16 @@ this.EXPORTED_SYMBOLS = ["GMPInstallMana
 
 // Shared code for suppressing bad cert dialogs
 XPCOMUtils.defineLazyGetter(this, "gCertUtils", function() {
   let temp = { };
   Cu.import("resource://gre/modules/CertUtils.jsm", temp);
   return temp;
 });
 
-XPCOMUtils.defineLazyGetter(this, "isXPOrVista64", function () {
-  let os = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS;
-  if (os != "WINNT") {
-    return false;
-  }
-  let sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
-  if (parseFloat(sysInfo.getProperty("version")) < 6) {
-    return true;
-  }
-  return Services.appinfo.is64Bit;
-});
-
 XPCOMUtils.defineLazyModuleGetter(this, "UpdateUtils",
                                   "resource://gre/modules/UpdateUtils.jsm");
 
 function getScopedLogger(prefix) {
   // `PARENT_LOGGER_ID.` being passed here effectively links this logger
   // to the parentLogger.
   return Log.repository.getLoggerWithMessagePrefix("Toolkit.GMP", prefix + " ");
 }
@@ -236,21 +224,16 @@ GMPInstallManager.prototype = {
           return false;
         }
 
         if (gmpAddon.isInstalled) {
           log.info("Addon |" + gmpAddon.id + "| already installed.");
           return false;
         }
 
-        if (gmpAddon.isEME && isXPOrVista64) {
-          log.info("Addon |" + gmpAddon.id + "| not supported on this platform.");
-          return false;
-        }
-
         // Do not install from fallback if already installed as it
         // may be a downgrade
         if (usedFallback && gmpAddon.isUpdate) {
          log.info("Addon |" + gmpAddon.id + "| not installing updates based " +
                   "on fallback.");
          return false;
         }