Improve process launch handle sharing API.

content/browser/zygote_host/zygote_host_impl_linux.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/zygote_host/zygote_host_impl_linux.h"
 
 #include <sys/socket.h>
 
 #include "base/allocator/allocator_extension.h"
 #include "base/files/file_enumerator.h"
@@ skipping 121 matching lines @@
 int ZygoteHostImpl::GetRendererSandboxStatus() const {
   return renderer_sandbox_status_;
 }
 
 pid_t ZygoteHostImpl::LaunchZygote(base::CommandLine* cmd_line,
                                    base::ScopedFD* control_fd) {
   int fds[2];
   CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds));
   CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0]));
 
-  base::FileHandleMappingVector fds_to_map;
-  fds_to_map.push_back(std::make_pair(fds[1], kZygoteSocketPairFd));
+  base::LaunchOptions options;
+  options.fds_to_remap.push_back(std::make_pair(fds[1], kZygoteSocketPairFd));
 
   // Start up the sandbox host process and get the file descriptor for the
   // renderers to talk to it.
   const int sfd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
-  fds_to_map.push_back(std::make_pair(sfd, GetSandboxFD()));
+  options.fds_to_remap.push_back(std::make_pair(sfd, GetSandboxFD()));
 
-  base::LaunchOptions options;
   base::ScopedFD dummy_fd;
   if (use_suid_sandbox_) {
     std::unique_ptr<sandbox::SetuidSandboxHost> sandbox_host(
         sandbox::SetuidSandboxHost::Create());
     sandbox_host->PrependWrapper(cmd_line);
-    sandbox_host->SetupLaunchOptions(&options, &fds_to_map, &dummy_fd);
+    sandbox_host->SetupLaunchOptions(&options, &dummy_fd);
     sandbox_host->SetupLaunchEnvironment();
   }
 
-  options.fds_to_remap = &fds_to_map;
   base::Process process =
       use_namespace_sandbox_
           ? sandbox::NamespaceSandbox::LaunchProcess(*cmd_line, options)
           : base::LaunchProcess(*cmd_line, options);
   CHECK(process.IsValid()) << "Failed to launch zygote process";
 
   dummy_fd.reset();
   close(fds[1]);
   control_fd->reset(fds[0]);
 
@@ skipping 104 matching lines @@
   options.allow_new_privs = true;
 
   base::Process sandbox_helper_process =
       base::LaunchProcess(adj_oom_score_cmdline, options);
   if (sandbox_helper_process.IsValid())
     base::EnsureProcessGetsReaped(sandbox_helper_process.Pid());
 }
 #endif
 
 }  // namespace content