Improve process launch handle sharing API.

chromeos/process_proxy/process_proxy.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 "chromeos/process_proxy/process_proxy.h"
 
 #include <stddef.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 
@@ skipping 186 matching lines @@
 
   if (pt_pair_[PT_SLAVE_FD] == -1) {
     CloseFdPair(pt_pair);
     return false;
   }
 
   return true;
 }
 
 int ProcessProxy::LaunchProcess(const std::string& command, int slave_fd) {
+  base::LaunchOptions options;
+
   // Redirect crosh  process' output and input so we can read it.
-  base::FileHandleMappingVector fds_mapping;
-  fds_mapping.push_back(std::make_pair(slave_fd, STDIN_FILENO));
-  fds_mapping.push_back(std::make_pair(slave_fd, STDOUT_FILENO));
-  fds_mapping.push_back(std::make_pair(slave_fd, STDERR_FILENO));
-  base::LaunchOptions options;
+  options.fds_to_remap.push_back(std::make_pair(slave_fd, STDIN_FILENO));
+  options.fds_to_remap.push_back(std::make_pair(slave_fd, STDOUT_FILENO));
+  options.fds_to_remap.push_back(std::make_pair(slave_fd, STDERR_FILENO));
   // Do not set NO_NEW_PRIVS on processes if the system is in dev-mode. This
   // permits sudo in the crosh shell when in developer mode.
   options.allow_new_privs = base::CommandLine::ForCurrentProcess()->
       HasSwitch(chromeos::switches::kSystemInDevMode);
-  options.fds_to_remap = &fds_mapping;
   options.ctrl_terminal_fd = slave_fd;
   options.environ["TERM"] = "xterm";
 
   // Launch the process.
   process_.reset(new base::Process(base::LaunchProcess(
       base::CommandLine(base::FilePath(command)), options)));
 
   // TODO(rvargas) crbug/417532: This is somewhat wrong but the interface of
   // Open vends pid_t* so ownership is quite vague anyway, and Process::Close
   // doesn't do much in POSIX.
@@ skipping 12 matching lines @@
   }
   *fd = kInvalidFd;
 }
 
 void ProcessProxy::ClearFdPair(int* pipe) {
   pipe[PT_MASTER_FD] = kInvalidFd;
   pipe[PT_SLAVE_FD] = kInvalidFd;
 }
 
 }  // namespace chromeos