summaryrefslogtreecommitdiffstats
path: root/toolkit/xre/nsEmbedFunctions.cpp
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-05-03 01:24:31 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-05-03 01:24:31 +0200
commit4613b91ecac2745252c40be64e73de5ff920b02b (patch)
tree26b0aa50bb4d580b156ab2eb9825707a17f51e99 /toolkit/xre/nsEmbedFunctions.cpp
parente1490c07e29f5e4715f73088b7ca7aab4ada90a6 (diff)
downloadUXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar
UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.gz
UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.lz
UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.xz
UXP-4613b91ecac2745252c40be64e73de5ff920b02b.zip
Remove sandbox ductwork conditional code.
Diffstat (limited to 'toolkit/xre/nsEmbedFunctions.cpp')
-rw-r--r--toolkit/xre/nsEmbedFunctions.cpp16
1 files changed, 0 insertions, 16 deletions
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index 5f5dda939..a59299c8b 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -75,11 +75,6 @@
#include "mozilla/Telemetry.h"
-#if defined(MOZ_SANDBOX) && defined(XP_WIN)
-#include "mozilla/sandboxTarget.h"
-#include "mozilla/sandboxing/loggingCallbacks.h"
-#endif
-
#ifdef MOZ_IPDL_TESTS
#include "mozilla/_ipdltest/IPDLUnitTests.h"
#include "mozilla/_ipdltest/IPDLUnitTestProcessChild.h"
@@ -295,11 +290,6 @@ XRE_InitChildProcess(int aArgc,
freopen("CONIN$", "r", stdin);
}
-#if defined(MOZ_SANDBOX)
- if (aChildData->sandboxTargetServices) {
- SandboxTarget::Instance()->SetTargetServices(aChildData->sandboxTargetServices);
- }
-#endif
#endif
// NB: This must be called before profiler_init
@@ -565,12 +555,6 @@ XRE_InitChildProcess(int aArgc,
::SetProcessShutdownParameters(0x280 - 1, SHUTDOWN_NORETRY);
#endif
-#if defined(MOZ_SANDBOX) && defined(XP_WIN)
- // We need to do this after the process has been initialised, as
- // InitLoggingIfRequired may need access to prefs.
- mozilla::sandboxing::InitLoggingIfRequired(aChildData->ProvideLogFunction);
-#endif
-
OverrideDefaultLocaleIfNeeded();
// Run the UI event loop on the main thread.