Index: content/gpu/gpu_main.cc |
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc |
index 6c65f5c5cdd947883983ee996f704f6e7fc2fb8f..780c2d1faf1a59e4d0981c728022857f2f2e702a 100644 |
--- a/content/gpu/gpu_main.cc |
+++ b/content/gpu/gpu_main.cc |
@@ -57,7 +57,6 @@ |
#include "base/win/windows_version.h" |
#include "base/win/scoped_com_initializer.h" |
#include "content/common/gpu/media/dxva_video_decode_accelerator_win.h" |
-#include "sandbox/win/src/sandbox.h" |
#endif |
#if defined(USE_X11) |
@@ -107,7 +106,6 @@ bool CanAccessNvidiaDeviceFile(); |
#endif |
bool StartSandboxLinux(const gpu::GPUInfo&, GpuWatchdogThread*, bool); |
#elif defined(OS_WIN) |
-bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*); |
#endif |
base::LazyInstance<GpuChildThread::DeferredMessages> deferred_messages = |
@@ -369,7 +367,7 @@ int GpuMain(const MainFunctionParams& parameters) { |
should_initialize_gl_context); |
} |
#elif defined(OS_WIN) |
- gpu_info.sandboxed = StartSandboxWindows(parameters.sandbox_info); |
+ gpu_info.sandboxed = false; |
#elif defined(OS_MACOSX) |
gpu_info.sandboxed = Sandbox::SandboxIsCurrentlyActive(); |
#endif |
@@ -571,23 +569,6 @@ bool StartSandboxLinux(const gpu::GPUInfo& gpu_info, |
} |
#endif // defined(OS_LINUX) |
-#if defined(OS_WIN) |
-bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo* sandbox_info) { |
- TRACE_EVENT0("gpu,startup", "Lower token"); |
- |
- // For Windows, if the target_services interface is not zero, the process |
- // is sandboxed and we must call LowerToken() before rendering untrusted |
- // content. |
- sandbox::TargetServices* target_services = sandbox_info->target_services; |
- if (target_services) { |
- target_services->LowerToken(); |
- return true; |
- } |
- |
- return false; |
-} |
-#endif // defined(OS_WIN) |
- |
} // namespace. |
} // namespace content |