Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Unified Diff: chrome/test/automation/proxy_launcher.cc

Issue 7346017: Clean up users of a deprecated base::LaunchApp API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cros Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 {

Powered by Google App Engine
This is Rietveld 408576698