Chromium Code Reviews| 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..da9bdb7297c4a33b14831d4463996ff060dffbca 100644 |
| --- a/content/browser/browser_main_loop.cc |
| +++ b/content/browser/browser_main_loop.cc |
| @@ -207,6 +207,10 @@ 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)) { |
| + DCHECK(parsed_command_line.HasSwitch(switches::kNoSandbox)); |
|
rickyz (no longer on Chrome)
2016/10/04 20:00:32
Let's upgrade this to a CHECK with an error messag
Sami
2016/10/05 13:15:16
Done.
|
| + return; |
| + } |
| // Tickle the sandbox host and zygote host so they fork now. |
| RenderSandboxHostLinux::GetInstance()->Init(); |