Index: chrome/test/automation/proxy_launcher.cc |
diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc |
index f7f5795b2c622f7f43aa30572fe0fdbf9ab4029f..ad75064ec2bd53b673915873ffa828b29be78aad 100644 |
--- a/chrome/test/automation/proxy_launcher.cc |
+++ b/chrome/test/automation/proxy_launcher.cc |
@@ -440,9 +440,12 @@ bool ProxyLauncher::LaunchBrowserHelper(const LaunchState& state, bool wait, |
// 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) |
- bool started = base::LaunchApp(command_line, wait, |
- !state.show_window, process); |
+ 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) |
@@ -458,11 +461,10 @@ bool ProxyLauncher::LaunchBrowserHelper(const LaunchState& state, bool wait, |
base::file_handle_mapping_vector fds; |
if (automation_proxy_.get()) |
fds = automation_proxy_->fds_to_map(); |
- |
- bool started = base::LaunchApp(command_line.argv(), fds, wait, process); |
+ options.fds_to_remap = &fds; |
#endif |
- return started; |
+ return base::LaunchProcess(command_line, options); |
} |
AutomationProxy* ProxyLauncher::automation() const { |