Improve process launch handle sharing API.

chrome/utility/image_writer/image_writer_mac.cc

 // Copyright 2014 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 <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOBSD.h>
 #include <IOKit/IOKitLib.h>
 #include <IOKit/storage/IOBlockStorageDevice.h>
 #include <IOKit/storage/IOMedia.h>
 #include <IOKit/storage/IOStorageProtocolCharacteristics.h>
@@ skipping 57 matching lines @@
   }
 
   unmounter_->Unmount(
       device_path_.value(),
       continuation,
       base::Bind(
           &ImageWriter::Error, base::Unretained(this), error::kUnmountVolumes));
 }
 
 bool ImageWriter::OpenDevice() {
-  base::LaunchOptions options = base::LaunchOptions();
+  base::LaunchOptions options;
   options.wait = false;
 
   // Create a socket pair for communication.
   int sockets[2];
   int result = socketpair(AF_UNIX, SOCK_STREAM, 0, sockets);
   if (result == -1) {
     PLOG(ERROR) << "Unable to allocate socket pair.";
     return false;
   }
   base::ScopedFD parent_socket(sockets[0]);
   base::ScopedFD child_socket(sockets[1]);
 
   // Map the client socket to the client's STDOUT.
-  base::FileHandleMappingVector fd_map;
-  fd_map.push_back(std::pair<int, int>(child_socket.get(), STDOUT_FILENO));
-  options.fds_to_remap = &fd_map;
+  options.fds_to_remap.push_back(
+      std::pair<int, int>(child_socket.get(), STDOUT_FILENO));
 
   // Find the file path to open.
   base::FilePath real_device_path;
   if (device_path_.IsAbsolute()) {
     // This only occurs for tests where the device path is mocked with a
     // temporary file.
     real_device_path = device_path_;
   } else {
     // Get the raw device file. Writes need to be in multiples of
     // DAMediaBlockSize (usually 512). This is fine since WriteChunk() writes in
@@ skipping 60 matching lines @@
 
   if (child_exit_status) {
     LOG(ERROR) << "Child process returned failure.";
     return false;
   }
 
   return device_file_.IsValid();
 }
 
 }  // namespace image_writer