Improve process launch handle sharing API.

sandbox/linux/services/namespace_sandbox_unittest.cc

 // Copyright 2015 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 "sandbox/linux/services/namespace_sandbox.h"
 
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
@@ skipping 33 matching lines @@
     TestProcWithOptions(procname, NamespaceSandbox::Options());
   }
 
   void TestProcWithOptions(
       const std::string& procname,
       const NamespaceSandbox::Options& ns_sandbox_options) {
     if (!Credentials::CanCreateProcessInNewUserNS()) {
       return;
     }
 
-    base::FileHandleMappingVector fds_to_remap = {
-        std::make_pair(STDOUT_FILENO, STDOUT_FILENO),
-        std::make_pair(STDERR_FILENO, STDERR_FILENO),
-    };
     base::LaunchOptions launch_options;
-    launch_options.fds_to_remap = &fds_to_remap;
+    launch_options.fds_to_remap.push_back(
+        std::make_pair(STDOUT_FILENO, STDOUT_FILENO));
+    launch_options.fds_to_remap.push_back(
+        std::make_pair(STDERR_FILENO, STDERR_FILENO));
 
     base::Process process = NamespaceSandbox::LaunchProcessWithOptions(
         MakeCmdLine(procname), launch_options, ns_sandbox_options);
     ASSERT_TRUE(process.IsValid());
 
     const int kDummyExitCode = 42;
     int exit_code = kDummyExitCode;
     EXPECT_TRUE(process.WaitForExit(&exit_code));
     EXPECT_EQ(0, exit_code);
   }
@@ skipping 46 matching lines @@
   CHECK(RootDirectoryIsEmpty());
   return 0;
 }
 
 // Temporarily disabled on ASAN due to crbug.com/451603.
 TEST_F(NamespaceSandboxTest, DISABLE_ON_ASAN(ChrootAndDropCapabilities)) {
   TestProc("ChrootMe");
 }
 
 MULTIPROCESS_TEST_MAIN(NestedNamespaceSandbox) {
-  base::FileHandleMappingVector fds_to_remap = {
-      std::make_pair(STDOUT_FILENO, STDOUT_FILENO),
-      std::make_pair(STDERR_FILENO, STDERR_FILENO),
-  };
   base::LaunchOptions launch_options;
-  launch_options.fds_to_remap = &fds_to_remap;
+  launch_options.fds_to_remap.push_back(
+      std::make_pair(STDOUT_FILENO, STDOUT_FILENO));
+  launch_options.fds_to_remap.push_back(
+      std::make_pair(STDERR_FILENO, STDERR_FILENO));
+
   base::Process process = NamespaceSandbox::LaunchProcess(
       base::CommandLine(base::FilePath("/bin/true")), launch_options);
   CHECK(process.IsValid());
 
   const int kDummyExitCode = 42;
   int exit_code = kDummyExitCode;
   CHECK(process.WaitForExit(&exit_code));
   CHECK_EQ(0, exit_code);
   return 0;
 }
@@ skipping 90 matching lines @@
   CHECK(!NamespaceSandbox::InstallTerminationSignalHandler(
             SIGUSR1, NamespaceSandbox::SignalExitCode(SIGUSR1)));
 
   raise(SIGUSR1);
   CHECK_EQ(1, signal_handler_called);
 }
 
 }  // namespace
 
 }  // namespace sandbox