Clean up users of a deprecated base::LaunchApp API.

chrome/test/ui_test_utils.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/ui_test_utils.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 691 matching lines @@
   cmd_line->AppendArgNative(FILE_PATH_LITERAL("--root=") +
                             root_directory.value());
   if (!temp_dir_.CreateUniqueTempDir()) {
     LOG(ERROR) << "Unable to create a temporary directory.";
     return false;
   }
   websocket_pid_file_ = temp_dir_.path().AppendASCII("websocket.pid");
   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;
   }
   started_ = true;
   return true;
 }
 
 CommandLine* TestWebSocketServer::CreatePythonCommandLine() {
   // Note: Python's first argument must be the script; do not append CommandLine
   // switches, as they would precede the script path and break this CommandLine.
@@ skipping 31 matching lines @@
 
 TestWebSocketServer::~TestWebSocketServer() {
   if (!started_)
     return;
   // Append CommandLine arguments after the server script, switches won't work.
   scoped_ptr<CommandLine> cmd_line(CreateWebSocketServerCommandLine());
   cmd_line->AppendArg("--server=stop");
   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()
     : source_(NotificationService::AllSources()) {
 }
 
 TestNotificationObserver::~TestNotificationObserver() {}
 
 void TestNotificationObserver::Observe(int type,
                                        const NotificationSource& source,
@@ skipping 195 matching lines @@
   return taker.TakeRenderWidgetSnapshot(rwh, page_size, page_size, bitmap);
 }
 
 bool TakeEntirePageSnapshot(RenderViewHost* rvh, SkBitmap* bitmap) {
   DCHECK(bitmap);
   SnapshotTaker taker;
   return taker.TakeEntirePageSnapshot(rvh, bitmap);
 }
 
 }  // namespace ui_test_utils