summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui_test_utils.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/ui_test_utils.cc')
-rw-r--r--chrome/test/ui_test_utils.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
index d8f8c75..1fb3d3e 100644
--- a/chrome/test/ui_test_utils.cc
+++ b/chrome/test/ui_test_utils.cc
@@ -709,7 +709,9 @@ bool TestWebSocketServer::Start(const FilePath& root_directory) {
cmd_line->AppendArgNative(FILE_PATH_LITERAL("--pidfile=") +
websocket_pid_file_.value());
SetPythonPath();
- if (!base::LaunchApp(*cmd_line.get(), true, false, NULL)) {
+ base::LaunchOptions options;
+ options.wait = true;
+ if (!base::LaunchProcess(*cmd_line.get(), options)) {
LOG(ERROR) << "Unable to launch websocket server.";
return false;
}
@@ -761,7 +763,9 @@ TestWebSocketServer::~TestWebSocketServer() {
cmd_line->AppendArg("--chromium");
cmd_line->AppendArgNative(FILE_PATH_LITERAL("--pidfile=") +
websocket_pid_file_.value());
- base::LaunchApp(*cmd_line.get(), true, false, NULL);
+ base::LaunchOptions options;
+ options.wait = true;
+ base::LaunchProcess(*cmd_line.get(), options);
}
TestNotificationObserver::TestNotificationObserver()