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

chrome/test/layout_test_http_server.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/layout_test_http_server.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 64 matching lines @@
                            layout_tests_dir.value());
 
   // For Windows 7, if we start the lighttpd server on the foreground mode,
   // it will mess up with the command window and cause conhost.exe to crash. To
   // work around this, we start the http server on the background mode.
 #if defined(OS_WIN)
   if (base::win::GetVersion() >= base::win::VERSION_WIN7)
     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_;
 }
 
 bool LayoutTestHttpServer::Stop() {
   if (!running_) {
     LOG(ERROR) << "LayoutTestHttpServer not running.";
     return false;
   }
 
   CommandLine cmd_line(CommandLine::NO_PROGRAM);
   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;
 }