Improve process launch handle sharing API.

chrome/utility/importer/firefox_importer_unittest_utils_mac.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 "chrome/utility/importer/firefox_importer_unittest_utils.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 37 matching lines @@
     const std::string& mojo_channel_token) {
   base::CommandLine cl(*base::CommandLine::ForCurrentProcess());
   cl.AppendSwitchASCII(switches::kTestChildProcess, "NSSDecrypterChildProcess");
   cl.AppendSwitchASCII(switches::kMojoChannelToken, mojo_channel_token);
 
   // Set env variable needed for FF encryption libs to load.
   // See "chrome/utility/importer/nss_decryptor_mac.mm" for an explanation of
   // why we need this.
   base::LaunchOptions options;
   options.environ["DYLD_FALLBACK_LIBRARY_PATH"] = nss_path.value();
-
-  base::FileHandleMappingVector fds_to_map;
-  fds_to_map.push_back(std::pair<int, int>(
+  options.fds_to_remap.push_back(std::pair<int, int>(
       mojo_handle.get().handle,
       kMojoIPCChannel + base::GlobalDescriptors::kBaseDescriptor));
 
-  options.fds_to_remap = &fds_to_map;
   return base::LaunchProcess(cl.argv(), options);
 }
 
 }  // namespace
 
 //----------------------- Server --------------------
 
 // Class to communicate on the server side of the IPC Channel.
 // Method calls are sent over IPC and replies are read back into class
 // variables.
@@ skipping 219 matching lines @@
   std::unique_ptr<IPC::Channel> channel =
       IPC::Channel::CreateClient(mojo_handle.release(), &listener);
   CHECK(channel->Connect());
   listener.SetSender(channel.get());
 
   // run message loop
   base::RunLoop().Run();
 
   return 0;
 }