From 9e42d9ea2f36633eeb1447ad9980495e3d00b40f Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Thu, 6 Feb 2020 06:07:37 -0500
Subject: Issue #65 - Remove AppConstants from toolkit/mozapps/extensions

---
 toolkit/mozapps/extensions/GMPUtils.jsm | 17 ++++++++++-------
 toolkit/mozapps/extensions/moz.build    |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'toolkit/mozapps')

diff --git a/toolkit/mozapps/extensions/GMPUtils.jsm b/toolkit/mozapps/extensions/GMPUtils.jsm
index 814ae4914..3c691610d 100644
--- a/toolkit/mozapps/extensions/GMPUtils.jsm
+++ b/toolkit/mozapps/extensions/GMPUtils.jsm
@@ -15,7 +15,6 @@ this.EXPORTED_SYMBOLS = [ "GMP_PLUGIN_IDS",
 
 Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/AppConstants.jsm");
 
 // GMP IDs
 const OPEN_H264_ID  = "gmp-gmpopenh264";
@@ -71,21 +70,25 @@ this.GMPUtils = {
       return true;
     }
     if (aPlugin.id == WIDEVINE_ID) {
+
+#if defined(XP_WIN) || defined(XP_LINUX) || defined(XP_MACOSX)
       // The Widevine plugin is available for Windows versions Vista and later,
       // Mac OSX, and Linux.
-      return AppConstants.isPlatformAndVersionAtLeast("win", "6") ||
-             AppConstants.platform == "macosx" ||
-             AppConstants.platform == "linux";
+      return true;
+#else
+      return false;
+#endif
     }
 
     return true;
   },
 
   _is32bitModeMacOS: function() {
-    if (AppConstants.platform != "macosx") {
-      return false;
-    }
+#ifdef XP_MACOSX
     return Services.appinfo.XPCOMABI.split("-")[0] == "x86";
+#else
+    return false;
+#endif
   },
 
   /**
diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build
index 104e8d734..b65ce4c68 100644
--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/extensions/moz.build
@@ -29,13 +29,13 @@ EXTRA_PP_COMPONENTS += [
 EXTRA_JS_MODULES += [
     'ChromeManifestParser.jsm',
     'DeferredSave.jsm',
-    'GMPUtils.jsm',
     'LightweightThemeManager.jsm',
 ]
 
 EXTRA_PP_JS_MODULES += [
     'AddonManager.jsm',
     'GMPInstallManager.jsm',
+    'GMPUtils.jsm',
 ]
 
 # Additional debugging info is exposed in debug builds
-- 
cgit v1.2.3