Alter the design of the bootstrap sandbox to only take over the bootstrap port of children when nec…

content/browser/child_process_launcher.cc

 // Copyright (c) 2012 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/browser/child_process_launcher.h"
 
 #include <utility>  // For std::pair.
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 270 matching lines @@
       MachBroker* broker = MachBroker::GetInstance();
       broker->GetLock().Acquire();
 
       // Make sure the MachBroker is running, and inform it to expect a
       // check-in from the new process.
       broker->EnsureRunning();
 
       const int bootstrap_sandbox_policy = delegate->GetSandboxType();
       if (ShouldEnableBootstrapSandbox() &&
           bootstrap_sandbox_policy != SANDBOX_TYPE_INVALID) {
+        options.replacement_bootstrap_name =
+            GetBootstrapSandbox()->server_bootstrap_name();
         GetBootstrapSandbox()->PrepareToForkWithPolicy(
             bootstrap_sandbox_policy);
       }
 #endif  // defined(OS_MACOSX)
 
       bool launched = base::LaunchProcess(*cmd_line, options, &handle);
       if (!launched)
         handle = base::kNullProcessHandle;
 
 #if defined(OS_MACOSX)
@@ skipping 214 matching lines @@
           GetHandle(), background));
 }
 
 void ChildProcessLauncher::SetTerminateChildOnShutdown(
     bool terminate_on_shutdown) {
   if (context_.get())
     context_->set_terminate_child_on_shutdown(terminate_on_shutdown);
 }
 
 }  // namespace content