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

chrome_frame/test/chrome_frame_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_frame/test/chrome_frame_test_utils.h"
 
 #include <atlapp.h>
 #include <atlmisc.h>
 #include <iepmapi.h>
 #include <sddl.h>
@@ skipping 141 matching lines @@
 base::ProcessHandle LaunchExecutable(const std::wstring& executable,
                                      const std::wstring& argument) {
   base::ProcessHandle process = NULL;
   std::wstring path = GetExecutableAppPath(executable);
   if (path.empty()) {
     path = FormatCommandForApp(executable, argument);
     if (path.empty()) {
       LOG(ERROR) << "Failed to find executable: " << executable;
     } else {
       CommandLine cmdline = CommandLine::FromString(path);
-      if (!base::LaunchApp(cmdline, false, false, &process)) {
-        LOG(ERROR) << "LaunchApp failed: " << ::GetLastError();
+      base::LaunchOptions options;
+      options.process_handle = &process;
+      if (!base::LaunchProcess(cmdline, options)) {
+        LOG(ERROR) << "LaunchProcess failed: " << ::GetLastError();
       }
     }
   } else {
     CommandLine cmdline((FilePath(path)));
     cmdline.AppendArgNative(argument);
-    if (!base::LaunchApp(cmdline, false, false, &process)) {
-      LOG(ERROR) << "LaunchApp failed: " << ::GetLastError();
+    base::LaunchOptions options;
+    options.process_handle = &process;
+    if (!base::LaunchProcess(cmdline, options)) {
+      LOG(ERROR) << "LaunchProcess failed: " << ::GetLastError();
     }
   }
   return process;
 }
 
 base::ProcessHandle LaunchChrome(const std::wstring& url) {
   FilePath path;
   PathService::Get(base::DIR_MODULE, &path);
   path = path.AppendASCII(kChromeImageName);
 
   CommandLine cmd(path);
   cmd.AppendSwitch(switches::kNoFirstRun);
   cmd.AppendArgNative(url);
 
   base::ProcessHandle process = NULL;
-  base::LaunchApp(cmd, false, false, &process);
+  base::LaunchOptions options;
+  options.process_handle = &process;
+  base::LaunchProcess(cmd, options);
   return process;
 }
 
 base::ProcessHandle LaunchIEOnVista(const std::wstring& url) {
   typedef HRESULT (WINAPI* IELaunchURLPtr)(
       const wchar_t* url,
       PROCESS_INFORMATION *pi,
       VOID *info);
 
   IELaunchURLPtr launch;
@@ skipping 386 matching lines @@
   if (!PathService::Get(base::DIR_EXE, &exe_dir)) {
     DCHECK(false);
     return NULL;
   }
 
   base::ProcessHandle crash_service = NULL;
 
   DVLOG(1) << "Starting crash_service.exe so you know if a test crashes!";
 
   FilePath crash_service_path = exe_dir.AppendASCII("crash_service.exe");
-  if (!base::LaunchApp(crash_service_path.value(), false, false,
-                       &crash_service)) {
+  base::LaunchOptions options;
+  options.process_handle = &crash_service;
+  if (!base::LaunchProcess(crash_service_path.value(), options)) {
     DLOG(ERROR) << "Couldn't start crash_service.exe";
     return NULL;
   }
 
   base::Time start = base::Time::Now();
 
   if (DetectRunningCrashService(kCrashServiceStartupTimeoutMs)) {
     DVLOG(1) << "crash_service.exe is ready for clients in "
              << (base::Time::Now() - start).InMilliseconds() << " ms.";
     return crash_service;
@@ skipping 69 matching lines @@
   wchar_t local_app_data_path[MAX_PATH + 1] = {0};
   SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT,
                   local_app_data_path);
 
   std::wstring session_history_path = local_app_data_path;
   session_history_path += L"\\Microsoft\\Internet Explorer\\Recovery";
   file_util::Delete(session_history_path, true);
 }
 
 }  // namespace chrome_frame_test