From a9e84e7842444a3d9ecdb31033f91859520dffba Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Sat, 23 May 2015 17:09:45 -0700 Subject: [PATCH] No bug, fix merge bustage in GMPProvider.jsm, a=me --- .../extensions/internal/GMPProvider.jsm | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.jsm b/toolkit/mozapps/extensions/internal/GMPProvider.jsm index 9fe3f4ec797..dacaeaacb8d 100644 --- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm +++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm @@ -465,25 +465,8 @@ GMPWrapper.prototype = { return f.exists(); }; - // Determine the name of the GMP dynamic library; it differs on every - // platform. Note: we can't use Services.appInfo.OS here, as that's - // "XPCShell" in our tests. - let isWindows = ("@mozilla.org/windows-registry-key;1" in Cc); - let isOSX = ("nsILocalFileMac" in Ci); - let isLinux = ("@mozilla.org/gnome-gconf-service;1" in Cc); - - let libName = ""; - let id = this._plugin.id; - if (isWindows) { - libName = id.substring(4) + ".dll"; - } else if (isOSX) { - libName = "lib" + id.substring(4) + ".dylib"; - } else if (isLinux) { - libName = id.substring(4) + ".so"; - } else { - this._log.info("_arePluginFilesOnDisk - unsupported platform."); - return false; - } + let id = this._plugin.id.substring(4); + let libName = AppConstants.DLL_PREFIX + id + AppConstants.DLL_SUFFIX; return fileExists(this.gmpPath, libName) && fileExists(this.gmpPath, id + ".info");