diff options
| -rw-r--r-- | toolkit/mozapps/extensions/GMPUtils.jsm | 11 | ||||
| -rw-r--r-- | tools/lint/eslint/modules.json | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/toolkit/mozapps/extensions/GMPUtils.jsm b/toolkit/mozapps/extensions/GMPUtils.jsm index a199b4d86..814ae4914 100644 --- a/toolkit/mozapps/extensions/GMPUtils.jsm +++ b/toolkit/mozapps/extensions/GMPUtils.jsm @@ -7,8 +7,7 @@ const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu, manager: Cm} = Components; -this.EXPORTED_SYMBOLS = [ "EME_ADOBE_ID", - "GMP_PLUGIN_IDS", +this.EXPORTED_SYMBOLS = [ "GMP_PLUGIN_IDS", "GMPPrefs", "GMPUtils", "OPEN_H264_ID", @@ -20,9 +19,8 @@ Cu.import("resource://gre/modules/AppConstants.jsm"); // GMP IDs const OPEN_H264_ID = "gmp-gmpopenh264"; -const EME_ADOBE_ID = "gmp-eme-adobe"; const WIDEVINE_ID = "gmp-widevinecdm"; -const GMP_PLUGIN_IDS = [ OPEN_H264_ID, EME_ADOBE_ID, WIDEVINE_ID ]; +const GMP_PLUGIN_IDS = [ OPEN_H264_ID, WIDEVINE_ID ]; var GMPPluginUnsupportedReason = { NOT_WINDOWS: 1, @@ -72,10 +70,7 @@ this.GMPUtils = { if (this._isPluginForceSupported(aPlugin)) { return true; } - if (aPlugin.id == EME_ADOBE_ID) { - // Windows Vista and later only supported by Adobe EME. - return AppConstants.isPlatformAndVersionAtLeast("win", "6"); - } else if (aPlugin.id == WIDEVINE_ID) { + if (aPlugin.id == WIDEVINE_ID) { // The Widevine plugin is available for Windows versions Vista and later, // Mac OSX, and Linux. return AppConstants.isPlatformAndVersionAtLeast("win", "6") || diff --git a/tools/lint/eslint/modules.json b/tools/lint/eslint/modules.json index 1ff546978..d170f81be 100644 --- a/tools/lint/eslint/modules.json +++ b/tools/lint/eslint/modules.json @@ -88,7 +88,7 @@ "Gestures.jsm": ["GestureSettings", "GestureTracker"], "GMPInstallManager.jsm": ["GMPInstallManager", "GMPExtractor", "GMPDownloader", "GMPAddon"], "GMPProvider.jsm": [], - "GMPUtils.jsm": ["EME_ADOBE_ID", "GMP_PLUGIN_IDS", "GMPPrefs", "GMPUtils", "OPEN_H264_ID", "WIDEVINE_ID"], + "GMPUtils.jsm": ["GMP_PLUGIN_IDS", "GMPPrefs", "GMPUtils", "OPEN_H264_ID", "WIDEVINE_ID"], "hawkclient.js": ["HawkClient"], "hawkrequest.js": ["HAWKAuthenticatedRESTRequest", "deriveHawkCredentials"], "HelperApps.jsm": ["App", "HelperApps"], |