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

Backed out changeset f3f667c17c26 (bug 953156) for XPC Bustage on a CLOSED TREE

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-01-07 12:41:45 +01:00
parent e827aa303e
commit d7ed5ac1a8
4 changed files with 1 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/mozapps/extensions/XPIProvider.jsm
View File

@ -4291,7 +4291,7 @@ var XPIProvider = {
}
}
finally {
if (aMethod == "shutdown" && aReason != BOOTSTRAP_REASONS.APP_SHUTDOWN) {
if (aMethod == "shutdown") {
LOG("Removing manifest for " + aFile.path);
Components.manager.removeBootstrappedManifestLocation(aFile);
}

51
toolkit/mozapps/extensions/test/xpcshell/test_bug953156.js
View File

@ -1,51 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
function run_test() {
do_test_pending();
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
startupManager();
prepare_test({ }, [
"onNewInstall"
]);
AddonManager.getInstallForFile(do_get_addon("test_bug675371"), function(install) {
ensure_test_completed();
do_check_neq(install, null);
prepare_test({
"bug675371@tests.mozilla.org": [
["onInstalling", false],
"onInstalled"
]
}, [
"onInstallStarted",
"onInstallEnded"
], callback_soon(check_test));
install.install();
});
}
function check_test() {
AddonManager.getAddonByID("bug675371@tests.mozilla.org", do_exception_wrap(function(addon) {
do_check_neq(addon, null);
do_check_true(addon.isActive);
// Tests that chrome.manifest is registered when the addon is installed.
var target = { active: false };
Services.scriptloader.loadSubScript("chrome://bug675371/content/test.js", target);
do_check_true(target.active);
shutdownManager();
// Tests that chrome.manifest remains registered at app shutdown.
target.active = false;
Services.scriptloader.loadSubScript("chrome://bug675371/content/test.js", target);
do_check_true(target.active);
do_execute_soon(do_test_finished);
}));
}

9
toolkit/mozapps/extensions/test/xpcshell/test_langpack.js
View File

@ -27,12 +27,6 @@ registerDirectory("XREAppDist", distroDir.parent);
var chrome = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
.getService(Components.interfaces.nsIXULChromeRegistry);
function do_unregister_manifest() {
let path = profileDir.clone();
path.append("langpack-x-testing@tests.mozilla.org.xpi");
Components.manager.removeBootstrappedManifestLocation(path);
}
function do_check_locale_not_registered(provider) {
let didThrow = false;
try {
@ -209,7 +203,6 @@ function run_test_4() {
// Tests that a restart shuts down and restarts the add-on
function run_test_5() {
shutdownManager();
do_unregister_manifest();
// check chrome reg that language pack is not registered
do_check_locale_not_registered("test-langpack");
startupManager(false);
@ -286,7 +279,6 @@ function run_test_8() {
do_check_false(b1.hasResource("bootstrap.js"));
shutdownManager();
do_unregister_manifest();
// check chrome reg that language pack is not registered
do_check_locale_not_registered("test-langpack");
startupManager(false);
@ -328,7 +320,6 @@ function run_test_9() {
do_check_false(b1.hasResource("bootstrap.js"));
shutdownManager();
do_unregister_manifest();
// check chrome reg that language pack is not registered
do_check_locale_not_registered("test-langpack");
startupManager(false);

1
toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
View File

@ -140,7 +140,6 @@ fail-if = os == "android"
[test_bug740612.js]
[test_bug753900.js]
[test_bug757663.js]
[test_bug953156.js]
[test_cacheflush.js]
[test_checkcompatibility.js]
[test_childprocess.js]