From e0cff217f540cd8a535b5eab06e8a51a140253bf Mon Sep 17 00:00:00 2001 From: Stephen Pohl Date: Tue, 17 Feb 2015 12:50:03 -0500 Subject: [PATCH] Bug 1089867: Rename OpenH264Provider.jsm to GMPProvider.jsm. r=gfritzsche --HG-- rename : toolkit/mozapps/extensions/internal/OpenH264Provider.jsm => toolkit/mozapps/extensions/internal/GMPProvider.jsm --- toolkit/mozapps/extensions/extensions.manifest | 2 +- .../{OpenH264Provider.jsm => GMPProvider.jsm} | 16 ++++++++-------- toolkit/mozapps/extensions/internal/moz.build | 2 +- .../extensions/test/browser/browser_openH264.js | 6 +++--- .../extensions/test/xpcshell/test_openh264.js | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) rename toolkit/mozapps/extensions/internal/{OpenH264Provider.jsm => GMPProvider.jsm} (97%) diff --git a/toolkit/mozapps/extensions/extensions.manifest b/toolkit/mozapps/extensions/extensions.manifest index 1cfbee3ebe1..f0f00545f68 100644 --- a/toolkit/mozapps/extensions/extensions.manifest +++ b/toolkit/mozapps/extensions/extensions.manifest @@ -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 diff --git a/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm b/toolkit/mozapps/extensions/internal/GMPProvider.jsm similarity index 97% rename from toolkit/mozapps/extensions/internal/OpenH264Provider.jsm rename to toolkit/mozapps/extensions/internal/GMPProvider.jsm index c60ac6c9513..d0cb0bd5811 100644 --- a/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm +++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm @@ -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, diff --git a/toolkit/mozapps/extensions/internal/moz.build b/toolkit/mozapps/extensions/internal/moz.build index f0752799ab4..f6f168e74c2 100644 --- a/toolkit/mozapps/extensions/internal/moz.build +++ b/toolkit/mozapps/extensions/internal/moz.build @@ -10,8 +10,8 @@ EXTRA_JS_MODULES.addons += [ 'AddonRepository_SQLiteMigrator.jsm', 'AddonUpdateChecker.jsm', 'Content.js', + 'GMPProvider.jsm', 'LightweightThemeImageOptimizer.jsm', - 'OpenH264Provider.jsm', 'SpellCheckDictionaryBootstrap.js', ] diff --git a/toolkit/mozapps/extensions/test/browser/browser_openH264.js b/toolkit/mozapps/extensions/test/browser/browser_openH264.js index 1bee700b066..db9c9fd61ea 100644 --- a/toolkit/mozapps/extensions/test/browser/browser_openH264.js +++ b/toolkit/mozapps/extensions/test/browser/browser_openH264.js @@ -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() { diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_openh264.js b/toolkit/mozapps/extensions/test/xpcshell/test_openh264.js index 4ff8d913c96..9e3f2793291 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/test_openh264.js +++ b/toolkit/mozapps/extensions/test/xpcshell/test_openh264.js @@ -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,