summaryrefslogtreecommitdiffstats
path: root/toolkit/xre
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/xre')
-rw-r--r--toolkit/xre/nsAppRunner.cpp9
-rw-r--r--toolkit/xre/test/browser_checkdllblockliststate.js2
-rw-r--r--toolkit/xre/test/marionette/gen_win32k_tests.py3
-rw-r--r--toolkit/xre/test/marionette/test_fission_autostart.py3
-rw-r--r--toolkit/xre/test/marionette/test_win32k_enrollment.py24
-rw-r--r--toolkit/xre/test/test_launch_without_hang.js6
-rw-r--r--toolkit/xre/test/win/mochitest/browser_env_path_long.js2
7 files changed, 16 insertions, 33 deletions
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index c1b712984b..35c58d9b36 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -285,8 +285,6 @@ static const char kPrefHealthReportUploadEnabled[] =
static const char kPrefDefaultAgentEnabled[] = "default-browser-agent.enabled";
static const char kPrefServicesSettingsServer[] = "services.settings.server";
-static const char kPrefSecurityContentSignatureRootHash[] =
- "security.content.signature.root_hash";
static const char kPrefSetDefaultBrowserUserChoicePref[] =
"browser.shell.setDefaultBrowserUserChoice";
#endif // defined(MOZ_DEFAULT_BROWSER_AGENT)
@@ -577,7 +575,7 @@ bool BrowserTabsRemoteAutostart() {
// then we could remove this automation-only env variable.
if (gBrowserTabsRemoteAutostart && xpc::AreNonLocalConnectionsDisabled()) {
const char* forceDisable = PR_GetEnv("MOZ_FORCE_DISABLE_E10S");
- if (forceDisable && *forceDisable == '1') {
+ if (forceDisable && !strcmp(forceDisable, "1")) {
gBrowserTabsRemoteAutostart = false;
status = kE10sForceDisabled;
}
@@ -2441,8 +2439,6 @@ static void OnDefaultAgentRemoteSettingsPrefChanged(const char* aPref,
nsAutoString valueName;
if (strcmp(aPref, kPrefServicesSettingsServer) == 0) {
valueName.AssignLiteral("ServicesSettingsServer");
- } else if (strcmp(aPref, kPrefSecurityContentSignatureRootHash) == 0) {
- valueName.AssignLiteral("SecurityContentSignatureRootHash");
} else {
return;
}
@@ -5595,9 +5591,6 @@ nsresult XREMain::XRE_mainRun() {
Preferences::RegisterCallbackAndCall(
&OnDefaultAgentRemoteSettingsPrefChanged,
kPrefServicesSettingsServer);
- Preferences::RegisterCallbackAndCall(
- &OnDefaultAgentRemoteSettingsPrefChanged,
- kPrefSecurityContentSignatureRootHash);
Preferences::RegisterCallbackAndCall(
&OnSetDefaultBrowserUserChoicePrefChanged,
diff --git a/toolkit/xre/test/browser_checkdllblockliststate.js b/toolkit/xre/test/browser_checkdllblockliststate.js
index 759c9b3635..cddd086991 100644
--- a/toolkit/xre/test/browser_checkdllblockliststate.js
+++ b/toolkit/xre/test/browser_checkdllblockliststate.js
@@ -5,7 +5,7 @@
add_task(async function test() {
await BrowserTestUtils.withNewTab(
{ gBrowser, url: "about:blank" },
- function (browser) {
+ function () {
ok(
Services.appinfo.windowsDLLBlocklistStatus,
"Windows dll blocklist status should be true, indicating it is " +
diff --git a/toolkit/xre/test/marionette/gen_win32k_tests.py b/toolkit/xre/test/marionette/gen_win32k_tests.py
index e0a39776db..2b90cdcefe 100644
--- a/toolkit/xre/test/marionette/gen_win32k_tests.py
+++ b/toolkit/xre/test/marionette/gen_win32k_tests.py
@@ -58,8 +58,7 @@ def set_e10s(enable):
if enable:
output.write(
"""
- app_version = self.execute_script("return Services.appinfo.version")
- self.restart(env={ENV_DISABLE_E10S: app_version})
+ self.restart(env={ENV_DISABLE_E10S: "1"})
self.set_env(ENV_DISABLE_E10S, "null")\n"""
)
else:
diff --git a/toolkit/xre/test/marionette/test_fission_autostart.py b/toolkit/xre/test/marionette/test_fission_autostart.py
index e34087aca9..40c083d00c 100644
--- a/toolkit/xre/test/marionette/test_fission_autostart.py
+++ b/toolkit/xre/test/marionette/test_fission_autostart.py
@@ -238,8 +238,7 @@ class TestFissionAutostart(MarionetteTestCase):
decision="enabledByDefault",
)
- app_version = self.execute_script("return Services.appinfo.version")
- self.restart(env={ENV_DISABLE_E10S: app_version})
+ self.restart(env={ENV_DISABLE_E10S: "1"})
self.check_fission_status(
enabled=False,
decision="disabledByE10sEnv",
diff --git a/toolkit/xre/test/marionette/test_win32k_enrollment.py b/toolkit/xre/test/marionette/test_win32k_enrollment.py
index d09331319b..7aaad1b0cd 100644
--- a/toolkit/xre/test/marionette/test_win32k_enrollment.py
+++ b/toolkit/xre/test/marionette/test_win32k_enrollment.py
@@ -389,8 +389,7 @@ class TestWin32kAutostart(MarionetteTestCase):
self.marionette.set_pref(Prefs.WIN32K, True)
- app_version = self.execute_script("return Services.appinfo.version")
- self.restart(env={ENV_DISABLE_E10S: app_version})
+ self.restart(env={ENV_DISABLE_E10S: "1"})
self.set_env(ENV_DISABLE_E10S, "null")
self.check_win32k_status(
@@ -623,8 +622,7 @@ class TestWin32kAutostart(MarionetteTestCase):
self.marionette.set_pref(Prefs.WIN32K, True)
- app_version = self.execute_script("return Services.appinfo.version")
- self.restart(env={ENV_DISABLE_E10S: app_version})
+ self.restart(env={ENV_DISABLE_E10S: "1"})
self.set_env(ENV_DISABLE_E10S, "null")
self.check_win32k_status(
@@ -869,8 +867,7 @@ class TestWin32kAutostart(MarionetteTestCase):
enrollmentStatusPref=ExperimentStatus.UNENROLLED,
)
- app_version = self.execute_script("return Services.appinfo.version")
- self.restart(env={ENV_DISABLE_E10S: app_version})
+ self.restart(env={ENV_DISABLE_E10S: "1"})
self.set_env(ENV_DISABLE_E10S, "null")
self.check_win32k_status(
@@ -1137,8 +1134,7 @@ class TestWin32kAutostart(MarionetteTestCase):
enrollmentStatusPref=ExperimentStatus.UNENROLLED,
)
- app_version = self.execute_script("return Services.appinfo.version")
- self.restart(env={ENV_DISABLE_E10S: app_version})
+ self.restart(env={ENV_DISABLE_E10S: "1"})
self.set_env(ENV_DISABLE_E10S, "null")
self.check_win32k_status(
@@ -1366,8 +1362,7 @@ class TestWin32kAutostart(MarionetteTestCase):
# Re-set enrollment pref, like Normandy would do
self.set_enrollment_status(ExperimentStatus.ENROLLED_CONTROL)
- app_version = self.execute_script("return Services.appinfo.version")
- self.restart(env={ENV_DISABLE_E10S: app_version})
+ self.restart(env={ENV_DISABLE_E10S: "1"})
self.set_env(ENV_DISABLE_E10S, "null")
self.check_win32k_status(
@@ -1603,8 +1598,7 @@ class TestWin32kAutostart(MarionetteTestCase):
# Re-set enrollment pref, like Normandy would do
self.set_enrollment_status(ExperimentStatus.ENROLLED_CONTROL)
- app_version = self.execute_script("return Services.appinfo.version")
- self.restart(env={ENV_DISABLE_E10S: app_version})
+ self.restart(env={ENV_DISABLE_E10S: "1"})
self.set_env(ENV_DISABLE_E10S, "null")
self.check_win32k_status(
@@ -1853,8 +1847,7 @@ class TestWin32kAutostart(MarionetteTestCase):
# Re-set enrollment pref, like Normandy would do
self.set_enrollment_status(ExperimentStatus.ENROLLED_TREATMENT)
- app_version = self.execute_script("return Services.appinfo.version")
- self.restart(env={ENV_DISABLE_E10S: app_version})
+ self.restart(env={ENV_DISABLE_E10S: "1"})
self.set_env(ENV_DISABLE_E10S, "null")
self.check_win32k_status(
@@ -2103,8 +2096,7 @@ class TestWin32kAutostart(MarionetteTestCase):
# Re-set enrollment pref, like Normandy would do
self.set_enrollment_status(ExperimentStatus.ENROLLED_TREATMENT)
- app_version = self.execute_script("return Services.appinfo.version")
- self.restart(env={ENV_DISABLE_E10S: app_version})
+ self.restart(env={ENV_DISABLE_E10S: "1"})
self.set_env(ENV_DISABLE_E10S, "null")
self.check_win32k_status(
diff --git a/toolkit/xre/test/test_launch_without_hang.js b/toolkit/xre/test/test_launch_without_hang.js
index feacae36d4..eef1ece226 100644
--- a/toolkit/xre/test/test_launch_without_hang.js
+++ b/toolkit/xre/test/test_launch_without_hang.js
@@ -100,7 +100,7 @@ function terminateFirefox(completion) {
process.init(file);
let processObserver = {
- observe: function PO_observe(aSubject, aTopic, aData) {
+ observe: function PO_observe(aSubject, aTopic) {
info("topic: " + aTopic + ", process exitValue: " + process.exitValue);
Assert.equal(
@@ -135,7 +135,7 @@ function launchProcess(file, args, env, timeoutMS, handler, attemptCount) {
state.attempt = attemptCount;
state.processObserver = {
- observe: function PO_observe(aSubject, aTopic, aData) {
+ observe: function PO_observe(aSubject, aTopic) {
if (!state.appTimer) {
// the app timer has been canceled; this process has timed out already so don't process further.
handler(false);
@@ -170,7 +170,7 @@ function launchProcess(file, args, env, timeoutMS, handler, attemptCount) {
// The timer callback to kill the process if it takes too long.
state.appTimerCallback = {
- notify: function TC_notify(aTimer) {
+ notify: function TC_notify() {
state.appTimer = null;
info("Restoring environment variables");
diff --git a/toolkit/xre/test/win/mochitest/browser_env_path_long.js b/toolkit/xre/test/win/mochitest/browser_env_path_long.js
index 9bc63214b0..33832bba77 100644
--- a/toolkit/xre/test/win/mochitest/browser_env_path_long.js
+++ b/toolkit/xre/test/win/mochitest/browser_env_path_long.js
@@ -6,7 +6,7 @@
add_task(async function test() {
await BrowserTestUtils.withNewTab(
{ gBrowser, url: "about:blank" },
- function (browser) {
+ function () {
ok(
true,
"Browser should start even with potentially pathologically long PATH."
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 22:06:08 +0000