| Index: content/browser/browser_main_loop.cc
|
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
|
| index f4b76cb585a315e0e2897aaefa525eccbb7670e9..9b0950f631d9a6a2b2056ef9267ca108c0712924 100644
|
| --- a/content/browser/browser_main_loop.cc
|
| +++ b/content/browser/browser_main_loop.cc
|
| @@ -207,6 +207,11 @@ namespace {
|
| #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
| void SetupSandbox(const base::CommandLine& parsed_command_line) {
|
| TRACE_EVENT0("startup", "SetupSandbox");
|
| + if (parsed_command_line.HasSwitch(switches::kNoZygote)) {
|
| + CHECK(parsed_command_line.HasSwitch(switches::kNoSandbox))
|
| + << "--no-sandbox should be used together with --no--zygote";
|
| + return;
|
| + }
|
|
|
| // Tickle the sandbox host and zygote host so they fork now.
|
| RenderSandboxHostLinux::GetInstance()->Init();
|
|
|