Index: content/gpu/gpu_main.cc |
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc |
index 63f5273a34d444ff198e6d89e0dae77c9ae47baf..b583d0a125da1eeecdbc524875b3381fff515383 100644 |
--- a/content/gpu/gpu_main.cc |
+++ b/content/gpu/gpu_main.cc |
@@ -16,6 +16,7 @@ |
#include "base/threading/platform_thread.h" |
#include "build/build_config.h" |
#include "content/common/gpu/gpu_config.h" |
+#include "content/common/sandbox_linux.h" |
#include "content/gpu/gpu_child_thread.h" |
#include "content/gpu/gpu_info_collector.h" |
#include "content/gpu/gpu_process.h" |
@@ -231,11 +232,14 @@ int GpuMain(const MainFunctionParams& parameters) { |
#endif |
if (do_init_sandbox) { |
- if (watchdog_thread.get()) |
+ if (watchdog_thread.get()) { |
watchdog_thread->Stop(); |
- gpu_info.sandboxed = InitializeSandbox(); |
- if (watchdog_thread.get()) |
+ } |
+ gpu_info.sandboxed = |
+ LinuxSandbox::InitializeSandbox(LinuxSandbox::SANDBOX_CONFIG_GPU); |
+ if (watchdog_thread.get()) { |
watchdog_thread->Start(); |
+ } |
} |
} |
#endif |