wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1089867: Rename OpenH264Provider.jsm to GMPProvider.jsm. r=gfritzsche

Browse Source 
--HG--
rename : toolkit/mozapps/extensions/internal/OpenH264Provider.jsm => toolkit/mozapps/extensions/internal/GMPProvider.jsm
This commit is contained in:
Stephen Pohl 2015-02-17 12:50:03 -05:00
parent 79a1c40ba6
commit e0cff217f5
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/mozapps/extensions/extensions.manifest
View File

@ -16,5 +16,5 @@ category JavaScript-global-property InstallTrigger @mozilla.org/addons/installtr
#ifndef MOZ_WIDGET_ANDROID
category addon-provider-module PluginProvider resource://gre/modules/addons/PluginProvider.jsm
#endif
category addon-provider-module OpenH264Provider resource://gre/modules/addons/OpenH264Provider.jsm
category addon-provider-module GMPProvider resource://gre/modules/addons/GMPProvider.jsm
#endif

16
toolkit/mozapps/extensions/internal/OpenH264Provider.jsm → toolkit/mozapps/extensions/internal/GMPProvider.jsm
View File

@ -63,7 +63,7 @@ let gLogAppenderDump = null;
function configureLogging() {
if (!gLogger) {
gLogger = Log.repository.getLogger("Toolkit.OpenH264Provider");
gLogger = Log.repository.getLogger("Toolkit.GMPProvider");
gLogger.addAppender(new Log.ConsoleAppender(new Log.BasicFormatter()));
}
gLogger.level = prefs.get(OPENH264_PREF_LOGGING_LEVEL, Log.Level.Warn);
@ -201,7 +201,7 @@ let OpenH264Wrapper = {
return this._updateTask;
}
this._updateTask = Task.spawn(function* OpenH264Provider_updateTask() {
this._updateTask = Task.spawn(function* GMPProvider_updateTask() {
this._log.trace("findUpdates() - updateTask");
try {
let installManager = new GMPInstallManager();
@ -249,14 +249,14 @@ let OpenH264Wrapper = {
},
};
let OpenH264Provider = {
get name() "OpenH264Provider",
let GMPProvider = {
get name() "GMPProvider",
startup: function() {
configureLogging();
this._log = Log.repository.getLoggerWithMessagePrefix("Toolkit.OpenH264Provider",
"OpenH264Provider" + "::");
OpenH264Wrapper._log = Log.repository.getLoggerWithMessagePrefix("Toolkit.OpenH264Provider",
this._log = Log.repository.getLoggerWithMessagePrefix("Toolkit.GMPProvider",
"GMPProvider" + "::");
OpenH264Wrapper._log = Log.repository.getLoggerWithMessagePrefix("Toolkit.GMPProvider",
"OpenH264Wrapper" + "::");
this.gmpPath = null;
if (OpenH264Wrapper.isInstalled) {
@ -387,7 +387,7 @@ let OpenH264Provider = {
},
};
AddonManagerPrivate.registerProvider(OpenH264Provider, [
AddonManagerPrivate.registerProvider(GMPProvider, [
new AddonManagerPrivate.AddonType("plugin", URI_EXTENSION_STRINGS,
STRING_TYPE_NAME,
AddonManager.VIEW_TYPE_LIST, 6000,

2
toolkit/mozapps/extensions/internal/moz.build
View File

@ -10,8 +10,8 @@ EXTRA_JS_MODULES.addons += [
'AddonRepository_SQLiteMigrator.jsm',
'AddonUpdateChecker.jsm',
'Content.js',
'GMPProvider.jsm',
'LightweightThemeImageOptimizer.jsm',
'OpenH264Provider.jsm',
'SpellCheckDictionaryBootstrap.js',
]

6
toolkit/mozapps/extensions/test/browser/browser_openH264.js
View File

@ -6,7 +6,7 @@
Cu.import("resource://gre/modules/Promise.jsm");
let {AddonTestUtils} = Cu.import("resource://testing-common/AddonManagerTesting.jsm", {});
let OpenH264Scope = Cu.import("resource://gre/modules/addons/OpenH264Provider.jsm");
let GMPScope = Cu.import("resource://gre/modules/addons/GMPProvider.jsm");
const OPENH264_PLUGIN_ID = "gmp-gmpopenh264";
const OPENH264_PREF_BRANCH = "media." + OPENH264_PLUGIN_ID + ".";
@ -249,7 +249,7 @@ add_task(function* testUpdateButton() {
let doc = gManagerWindow.document;
let item = get_addon_element(gManagerWindow, OPENH264_PLUGIN_ID);
Object.defineProperty(OpenH264Scope, "GMPInstallManager", {
Object.defineProperty(GMPScope, "GMPInstallManager", {
value: MockGMPInstallManager,
writable: true,
enumerable: true,
@ -270,7 +270,7 @@ add_task(function* testUpdateButton() {
yield gInstallDeferred.promise;
Assert.equal(gInstalledAddonId, OPENH264_PLUGIN_ID);
delete OpenH264Scope.GMPInstallManager;
delete GMPScope.GMPInstallManager;
});
add_task(function* test_cleanup() {

8
toolkit/mozapps/extensions/test/xpcshell/test_openh264.js
View File

@ -192,8 +192,8 @@ add_task(function* test_pluginRegistration() {
removePluginDirectory: path => removedPaths.push(path),
};
let OpenH264Scope = Cu.import("resource://gre/modules/addons/OpenH264Provider.jsm");
OpenH264Scope.gmpService = MockGMPService;
let GMPScope = Cu.import("resource://gre/modules/addons/GMPProvider.jsm");
GMPScope.gmpService = MockGMPService;
Services.prefs.setBoolPref(OPENH264_PREF_ENABLED, true);
// Check that the OpenH264 plugin gets registered after startup.
@ -247,8 +247,8 @@ add_task(function* test_pluginRegistration() {
});
add_task(function* test_periodicUpdate() {
let OpenH264Scope = Cu.import("resource://gre/modules/addons/OpenH264Provider.jsm");
Object.defineProperty(OpenH264Scope, "GMPInstallManager", {
let GMPScope = Cu.import("resource://gre/modules/addons/GMPProvider.jsm");
Object.defineProperty(GMPScope, "GMPInstallManager", {
value: MockGMPInstallManager,
writable: true,
enumerable: true,