Improve process launch handle sharing API.

base/test/multiprocess_test_android.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 "base/test/multiprocess_test.h"
 
 #include <string.h>
 #include <vector>
 
 #include "base/android/jni_android.h"
@@ skipping 15 matching lines @@
 // NOTE: This MUST NOT run on the main thread of the NativeTest application.
 SpawnChildResult SpawnMultiProcessTestChild(
     const std::string& procname,
     const CommandLine& base_command_line,
     const LaunchOptions& options) {
   JNIEnv* env = android::AttachCurrentThread();
   DCHECK(env);
 
   std::vector<int> fd_keys;
   std::vector<int> fd_fds;
-  if (options.fds_to_remap) {
-    for (auto& iter : *options.fds_to_remap) {
-      fd_keys.push_back(iter.second);
-      fd_fds.push_back(iter.first);
-    }
+  for (auto& iter : options.fds_to_remap) {
+    fd_keys.push_back(iter.second);
+    fd_fds.push_back(iter.first);
   }
 
   android::ScopedJavaLocalRef<jobjectArray> fds =
       android::Java_MultiprocessTestClientLauncher_makeFdInfoArray(
           env, base::android::ToJavaIntArray(env, fd_keys),
           base::android::ToJavaIntArray(env, fd_fds));
 
   CommandLine command_line(base_command_line);
   if (!command_line.HasSwitch(switches::kTestChildProcess)) {
     command_line.AppendSwitchASCII(switches::kTestChildProcess, procname);
@@ skipping 32 matching lines @@
                                     int exit_code,
                                     bool wait) {
   JNIEnv* env = android::AttachCurrentThread();
   DCHECK(env);
 
   return android::Java_MultiprocessTestClientLauncher_terminate(
       env, process.Pid(), exit_code, wait);
 }
 
 }  // namespace base