Change base::LaunchProcess API slightly

content/browser/zygote_host_linux.cc

 // Copyright (c) 2011 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 "content/browser/zygote_host_linux.h"
 
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ skipping 133 matching lines @@
 
   int dummy_fd = -1;
   if (using_suid_sandbox_) {
     dummy_fd = socket(PF_UNIX, SOCK_DGRAM, 0);
     CHECK(dummy_fd >= 0);
     fds_to_map.push_back(std::make_pair(dummy_fd, 7));
   }
 
   base::ProcessHandle process = -1;
   base::LaunchOptions options;
-  options.process_handle = &process;
   options.fds_to_remap = &fds_to_map;
-  base::LaunchProcess(cmd_line.argv(), options);
+  base::LaunchProcess(cmd_line.argv(), options, &process);
   CHECK(process != -1) << "Failed to launch zygote process";
 
   if (using_suid_sandbox_) {
     // In the SUID sandbox, the real zygote is forked from the sandbox.
     // We need to look for it.
     // But first, wait for the zygote to tell us it's running.
     // The sending code is in chrome/browser/zygote_main_linux.cc.
     std::vector<int> fds_vec;
     const int kExpectedLength = sizeof(kZygoteMagic);
     char buf[kExpectedLength];
@@ skipping 131 matching lines @@
   }
 
   if (using_suid_sandbox_ && !selinux) {
     std::vector<std::string> adj_oom_score_cmdline;
     adj_oom_score_cmdline.push_back(sandbox_binary_);
     adj_oom_score_cmdline.push_back(base::kAdjustOOMScoreSwitch);
     adj_oom_score_cmdline.push_back(base::Int64ToString(pid));
     adj_oom_score_cmdline.push_back(base::IntToString(score));
 
     base::ProcessHandle sandbox_helper_process;
-    base::LaunchOptions options;
-    options.process_handle = &sandbox_helper_process;
-    if (base::LaunchProcess(adj_oom_score_cmdline, options))
+    if (base::LaunchProcess(adj_oom_score_cmdline, base::LaunchOptions(),
+                            &sandbox_helper_process)) {
       ProcessWatcher::EnsureProcessGetsReaped(sandbox_helper_process);
+    }
   } else if (!using_suid_sandbox_) {
     if (!base::AdjustOOMScore(pid, score))
       PLOG(ERROR) << "Failed to adjust OOM score of renderer with pid " << pid;
   }
 }
 
 void ZygoteHost::EnsureProcessTerminated(pid_t process) {
   DCHECK(init_);
   Pickle pickle;
 
@@ skipping 42 matching lines @@
       !read_pickle.ReadInt(&iter, &tmp_exit_code)) {
     LOG(WARNING) << "Error parsing GetTerminationStatus response from zygote.";
     return base::TERMINATION_STATUS_NORMAL_TERMINATION;
   }
 
   if (exit_code)
     *exit_code = tmp_exit_code;
 
   return static_cast<base::TerminationStatus>(status);
 }