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

content/browser/child_process_launcher.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 "content/browser/child_process_launcher.h"
 
 #include <utility>  // For std::pair.
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 139 matching lines @@
         fds_to_map.push_back(std::make_pair(
             sandbox_fd,
             kSandboxIPCChannel + base::GlobalDescriptors::kBaseDescriptor));
       }
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 
       bool launched = false;
 #if defined(OS_MACOSX)
       // It is possible for the child process to die immediately after
       // launching.  To prevent leaking MachBroker map entries in this case,
-      // lock around all of LaunchApp().  If the child dies, the death
+      // lock around all of LaunchProcess().  If the child dies, the death
       // notification will be processed by the MachBroker after the call to
       // AddPlaceholderForPid(), enabling proper cleanup.
       {  // begin scope for AutoLock
         MachBroker* broker = MachBroker::GetInstance();
         base::AutoLock lock(broker->GetLock());
 
         // This call to |PrepareForFork()| will start the MachBroker listener
         // thread, if it is not already running.  Therefore the browser process
-        // will be listening for Mach IPC before LaunchApp() is called.
+        // will be listening for Mach IPC before LaunchProcess() is called.
         broker->PrepareForFork();
 #endif
+
         // Actually launch the app.
-        launched = base::LaunchApp(cmd_line->argv(), env, fds_to_map,
-                                   /* wait= */false, &handle);
+        base::LaunchOptions options;
+        options.environ = &env;

[Mark Mentovai, 2011/07/11 23:12:39]

Needed? Looks like env is empty.

+        options.fds_to_remap = &fds_to_map;
+        options.process_handle = &handle;
+        launched = base::LaunchProcess(*cmd_line, options);
+
 #if defined(OS_MACOSX)
         if (launched)
           broker->AddPlaceholderForPid(handle);
       }  // end scope for AutoLock
 #endif
       if (!launched)
         handle = base::kNullProcessHandle;
     }
 #endif  // else defined(OS_POSIX)
 
@@ skipping 183 matching lines @@
           &ChildProcessLauncher::Context::SetProcessBackgrounded,
           background));
 }
 
 void ChildProcessLauncher::SetTerminateChildOnShutdown(
   bool terminate_on_shutdown) {
   if (context_)
     context_->set_terminate_child_on_shutdown(terminate_on_shutdown);
 }