Change base::LaunchProcess API slightly

chrome/test/automation/proxy_launcher.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 "chrome/test/automation/proxy_launcher.h"
 
 #include "app/sql/connection.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/string_number_conversions.h"
@@ skipping 424 matching lines @@
   // Add command line arguments that should be applied to all UI tests.
   PrepareTestCommandline(&command_line, state.include_testing_id);
   DebugFlags::ProcessDebugFlags(
       &command_line, ChildProcessInfo::UNKNOWN_PROCESS, false);
 
   // TODO(phajdan.jr): Only run it for "main" browser launch.
   browser_launch_time_ = base::TimeTicks::Now();
 
   base::LaunchOptions options;
   options.wait = wait;
-  options.process_handle = process;
 
 #if defined(OS_WIN)
   options.start_hidden = !state.show_window;
 #elif defined(OS_POSIX)
   // Sometimes one needs to run the browser under a special environment
   // (e.g. valgrind) without also running the test harness (e.g. python)
   // under the special environment.  Provide a way to wrap the browser
   // commandline with a special prefix to invoke the special environment.
   const char* browser_wrapper = getenv("BROWSER_WRAPPER");
   if (browser_wrapper) {
     command_line.PrependWrapper(browser_wrapper);
     VLOG(1) << "BROWSER_WRAPPER was set, prefixing command_line with "
             << browser_wrapper;
   }
 
   base::file_handle_mapping_vector fds;
   if (automation_proxy_.get())
     fds = automation_proxy_->fds_to_map();
   options.fds_to_remap = &fds;
 #endif
 
-  return base::LaunchProcess(command_line, options);
+  return base::LaunchProcess(command_line, options, process);
 }
 
 AutomationProxy* ProxyLauncher::automation() const {
   EXPECT_TRUE(automation_proxy_.get());
   return automation_proxy_.get();
 }
 
 FilePath ProxyLauncher::user_data_dir() const {
   EXPECT_TRUE(temp_profile_dir_.IsValid());
   return temp_profile_dir_.path();
@@ skipping 99 matching lines @@
   ASSERT_TRUE(LaunchBrowserAndServer(state, wait_for_initial_loads));
 }
 
 void AnonymousProxyLauncher::TerminateConnection() {
   CloseBrowserAndServer();
 }
 
 std::string AnonymousProxyLauncher::PrefixedChannelID() const {
   return channel_id_;
 }