|
@@ -0,0 +1,31 @@
|
|
|
+# HG changeset patch
|
|
|
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
|
|
|
+# Date 1729157842 0
|
|
|
+Bug 9999999 - Port bug 1920463 to suite.
|
|
|
+Bug 1920463 - Remove RemoteSandboxBroker and AbstractSandboxBroker.
|
|
|
+
|
|
|
+diff --git a/suite/app/nsSuiteApp.cpp b/suite/app/nsSuiteApp.cpp
|
|
|
+--- a/suite/app/nsSuiteApp.cpp
|
|
|
++++ b/suite/app/nsSuiteApp.cpp
|
|
|
+@@ -343,21 +343,16 @@ int main(int argc, char* argv[], char* e
|
|
|
+ childData.sandboxTargetServices =
|
|
|
+ mozilla::sandboxing::GetInitializedTargetServices();
|
|
|
+ if (!childData.sandboxTargetServices) {
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+
|
|
|
+ childData.ProvideLogFunction = mozilla::sandboxing::ProvideLogFunction;
|
|
|
+ }
|
|
|
+-
|
|
|
+- if (GetGeckoProcessType() == GeckoProcessType_RemoteSandboxBroker) {
|
|
|
+- childData.sandboxBrokerServices =
|
|
|
+- mozilla::sandboxing::GetInitializedBrokerServices();
|
|
|
+- }
|
|
|
+ # endif
|
|
|
+
|
|
|
+ rv = gBootstrap->XRE_InitChildProcess(argc, argv, &childData);
|
|
|
+
|
|
|
+ // InitXPCOMGlue calls NS_LogInit, so we need to balance it here.
|
|
|
+ gBootstrap->NS_LogTerm();
|
|
|
+
|
|
|
+ return NS_FAILED(rv) ? 1 : 0;
|