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

Unified Diff: chrome/test/layout_test_http_server.cc

Issue 7351003: Clean up users of a deprecated base::LaunchApp API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win-only 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
« no previous file with comments | « chrome/service/service_child_process_host.cc ('k') | chrome/test/live_sync/live_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/layout_test_http_server.cc
diff --git a/chrome/test/layout_test_http_server.cc b/chrome/test/layout_test_http_server.cc
index cac126a7c45681f5cea6ae8439d87ecc2bbf9e68..34c79ab6d0fd0ddd0e4b462592af5d318d64b036 100644
--- a/chrome/test/layout_test_http_server.cc
+++ b/chrome/test/layout_test_http_server.cc
@@ -82,7 +82,12 @@ bool LayoutTestHttpServer::Start() {
cmd_line.AppendArg("--run_background");
#endif
- running_ = base::LaunchApp(cmd_line, true, false, NULL);
+ // The Python script waits for the server to start responding to requests,
+ // then exits. So we want to wait for the Python script to exit before
+ // continuing.
+ base::LaunchOptions options;
+ options.wait = true;
+ running_ = base::LaunchProcess(cmd_line, options);
return running_;
}
@@ -96,7 +101,10 @@ bool LayoutTestHttpServer::Stop() {
if (!PrepareCommandLine(&cmd_line))
return false;
cmd_line.AppendArg("--server=stop");
- bool stopped = base::LaunchApp(cmd_line, true, false, NULL);
+
+ base::LaunchOptions options;
+ options.wait = true;
+ bool stopped = base::LaunchProcess(cmd_line, options);
running_ = !stopped;
return stopped;
}
« no previous file with comments | « chrome/service/service_child_process_host.cc ('k') | chrome/test/live_sync/live_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698