Merge 140080 - Block ptrace (and ptrace-like) syscalls from the renderer and worker processs.

content/renderer/renderer_main_platform_delegate_linux.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/renderer_main_platform_delegate.h"
 
 #include "base/command_line.h"
 #include "content/common/seccomp_sandbox.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/sandbox_init.h"
 
 RendererMainPlatformDelegate::RendererMainPlatformDelegate(
     const content::MainFunctionParams& parameters)
     : parameters_(parameters) {
 }
 
 RendererMainPlatformDelegate::~RendererMainPlatformDelegate() {
 }
 
 void RendererMainPlatformDelegate::PlatformInitialize() {
@@ skipping 14 matching lines @@
   //
   // The seccomp sandbox is started in the renderer.
   // http://code.google.com/p/seccompsandbox/
 #if defined(SECCOMP_SANDBOX)
   // N.b. SupportsSeccompSandbox() returns a cached result, as we already
   // called it earlier in the zygote. Thus, it is OK for us to not pass in
   // a file descriptor for "/proc".
   if (SeccompSandboxEnabled() && SupportsSeccompSandbox(-1))
     StartSeccompSandbox();
 #endif
+  content::InitializeSandbox();
   return true;
 }
 
 void RendererMainPlatformDelegate::RunSandboxTests() {
   // The sandbox is started in the zygote process: zygote_main_linux.cc
   // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox
 }