summaryrefslogtreecommitdiffstats
path: root/xpcom
diff options
context:
space:
mode:
Diffstat (limited to 'xpcom')
-rw-r--r--xpcom/base/nsSystemInfo.cpp27
-rw-r--r--xpcom/build/XREChildData.h19
-rw-r--r--xpcom/build/XREShellData.h12
-rw-r--r--xpcom/build/nsXREAppData.h13
-rw-r--r--xpcom/glue/AppData.cpp4
5 files changed, 0 insertions, 75 deletions
diff --git a/xpcom/base/nsSystemInfo.cpp b/xpcom/base/nsSystemInfo.cpp
index f6d9fd5ad..a72dd3826 100644
--- a/xpcom/base/nsSystemInfo.cpp
+++ b/xpcom/base/nsSystemInfo.cpp
@@ -66,10 +66,6 @@ NS_EXPORT int android_sdk_version;
#include <sys/sysctl.h>
#endif
-#if defined(XP_LINUX) && defined(MOZ_SANDBOX)
-#include "mozilla/SandboxInfo.h"
-#endif
-
// Slot for NS_InitXPCOM2 to pass information to nsSystemInfo::Init.
// Only set to nonzero (potentially) if XP_UNIX. On such systems, the
// system call to discover the appropriate value is not thread-safe,
@@ -789,29 +785,6 @@ nsSystemInfo::Init()
}
#endif
-#if defined(XP_LINUX) && defined(MOZ_SANDBOX)
- SandboxInfo sandInfo = SandboxInfo::Get();
-
- SetPropertyAsBool(NS_LITERAL_STRING("hasSeccompBPF"),
- sandInfo.Test(SandboxInfo::kHasSeccompBPF));
- SetPropertyAsBool(NS_LITERAL_STRING("hasSeccompTSync"),
- sandInfo.Test(SandboxInfo::kHasSeccompTSync));
- SetPropertyAsBool(NS_LITERAL_STRING("hasUserNamespaces"),
- sandInfo.Test(SandboxInfo::kHasUserNamespaces));
- SetPropertyAsBool(NS_LITERAL_STRING("hasPrivilegedUserNamespaces"),
- sandInfo.Test(SandboxInfo::kHasPrivilegedUserNamespaces));
-
- if (sandInfo.Test(SandboxInfo::kEnabledForContent)) {
- SetPropertyAsBool(NS_LITERAL_STRING("canSandboxContent"),
- sandInfo.CanSandboxContent());
- }
-
- if (sandInfo.Test(SandboxInfo::kEnabledForMedia)) {
- SetPropertyAsBool(NS_LITERAL_STRING("canSandboxMedia"),
- sandInfo.CanSandboxMedia());
- }
-#endif // XP_LINUX && MOZ_SANDBOX
-
return NS_OK;
}
diff --git a/xpcom/build/XREChildData.h b/xpcom/build/XREChildData.h
index 487fede94..96b297d3c 100644
--- a/xpcom/build/XREChildData.h
+++ b/xpcom/build/XREChildData.h
@@ -9,14 +9,6 @@
#include "mozilla/UniquePtr.h"
-#if defined(XP_WIN) && defined(MOZ_SANDBOX)
-#include "mozilla/sandboxing/loggingTypes.h"
-
-namespace sandbox {
-class TargetServices;
-}
-#endif
-
namespace mozilla {
namespace gmp {
class GMPLoader;
@@ -35,17 +27,6 @@ struct XREChildData
mozilla::UniquePtr<mozilla::gmp::GMPLoader> gmpLoader;
#endif
-#if defined(XP_WIN) && defined(MOZ_SANDBOX)
- /**
- * Chromium sandbox TargetServices.
- */
- sandbox::TargetServices* sandboxTargetServices = nullptr;
-
- /**
- * Function to provide a logging function to the chromium sandbox code.
- */
- mozilla::sandboxing::ProvideLogFunctionCb ProvideLogFunction = nullptr;
-#endif
};
#endif // XREChildData_h
diff --git a/xpcom/build/XREShellData.h b/xpcom/build/XREShellData.h
index 11bc162d9..f734b1d74 100644
--- a/xpcom/build/XREShellData.h
+++ b/xpcom/build/XREShellData.h
@@ -7,23 +7,11 @@
#ifndef XREShellData_h
#define XREShellData_h
-#if defined(XP_WIN) && defined(MOZ_SANDBOX)
-namespace sandbox {
-class BrokerServices;
-}
-#endif
-
/**
* Data needed by XRE_XPCShellMain.
*/
struct XREShellData
{
-#if defined(XP_WIN) && defined(MOZ_SANDBOX)
- /**
- * Chromium sandbox BrokerServices.
- */
- sandbox::BrokerServices* sandboxBrokerServices;
-#endif
};
#endif // XREShellData_h
diff --git a/xpcom/build/nsXREAppData.h b/xpcom/build/nsXREAppData.h
index fbc7adb8f..129336ac9 100644
--- a/xpcom/build/nsXREAppData.h
+++ b/xpcom/build/nsXREAppData.h
@@ -12,12 +12,6 @@
class nsIFile;
-#if defined(XP_WIN) && defined(MOZ_SANDBOX)
-namespace sandbox {
-class BrokerServices;
-}
-#endif
-
/**
* Application-specific data needed to start the apprunner.
*
@@ -134,13 +128,6 @@ struct nsXREAppData
* The application name to use in the User Agent string.
*/
const char* UAName;
-
-#if defined(XP_WIN) && defined(MOZ_SANDBOX)
- /**
- * Chromium sandbox BrokerServices.
- */
- sandbox::BrokerServices* sandboxBrokerServices;
-#endif
};
/**
diff --git a/xpcom/glue/AppData.cpp b/xpcom/glue/AppData.cpp
index 845267e60..2fdb6b009 100644
--- a/xpcom/glue/AppData.cpp
+++ b/xpcom/glue/AppData.cpp
@@ -65,10 +65,6 @@ ScopedAppData::ScopedAppData(const nsXREAppData* aAppData)
if (aAppData->size > offsetof(nsXREAppData, UAName)) {
SetAllocatedString(this->UAName, aAppData->UAName);
}
-
-#if defined(XP_WIN) && defined(MOZ_SANDBOX)
- sandboxBrokerServices = aAppData->sandboxBrokerServices;
-#endif
}
ScopedAppData::~ScopedAppData()