summaryrefslogtreecommitdiffstats
path: root/ipc/contentproc/plugin-container.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 /ipc/contentproc/plugin-container.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 'ipc/contentproc/plugin-container.cpp')
-rw-r--r--ipc/contentproc/plugin-container.cpp40
1 files changed, 0 insertions, 40 deletions
diff --git a/ipc/contentproc/plugin-container.cpp b/ipc/contentproc/plugin-container.cpp
index 82ed16a90..6a9341d7f 100644
--- a/ipc/contentproc/plugin-container.cpp
+++ b/ipc/contentproc/plugin-container.cpp
@@ -22,11 +22,6 @@
#include "GMPLoader.h"
-#if defined(XP_WIN) && defined(MOZ_SANDBOX)
-#include "mozilla/sandboxing/SandboxInitialization.h"
-#include "mozilla/sandboxing/sandboxLogging.h"
-#endif
-
#ifdef MOZ_WIDGET_GONK
# include <sys/time.h>
# include <sys/resource.h>
@@ -62,26 +57,10 @@ InitializeBinder(void *aDummy) {
}
#endif
-#if defined(XP_WIN) && defined(MOZ_SANDBOX)
-class WinSandboxStarter : public mozilla::gmp::SandboxStarter {
-public:
- virtual bool Start(const char *aLibPath) override {
- if (IsSandboxedProcess()) {
- mozilla::sandboxing::LowerSandbox();
- }
- return true;
- }
-};
-#endif
-
mozilla::gmp::SandboxStarter*
MakeSandboxStarter()
{
-#if defined(XP_WIN) && defined(MOZ_SANDBOX)
- return new WinSandboxStarter();
-#else
return nullptr;
-#endif
}
int
@@ -95,27 +74,8 @@ content_process_main(int argc, char* argv[])
XREChildData childData;
-#if defined(XP_WIN) && defined(MOZ_SANDBOX)
- if (IsSandboxedProcess()) {
- childData.sandboxTargetServices =
- mozilla::sandboxing::GetInitializedTargetServices();
- if (!childData.sandboxTargetServices) {
- return 1;
- }
-
- childData.ProvideLogFunction = mozilla::sandboxing::ProvideLogFunction;
- }
-#endif
-
XRE_SetProcessType(argv[--argc]);
-#if defined(XP_LINUX) && defined(MOZ_SANDBOX)
- // This has to happen while we're still single-threaded, and on
- // B2G that means before the Android Binder library is
- // initialized.
- mozilla::SandboxEarlyInit(XRE_GetProcessType());
-#endif
-
#ifdef MOZ_WIDGET_GONK
// This creates a ThreadPool for binder ipc. A ThreadPool is necessary to
// receive binder calls, though not necessary to send binder calls.