From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:35:49 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 toolkit/xre/nsAppRunner.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'toolkit/xre/nsAppRunner.cpp')

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,
-- 
cgit v1.2.3