From 1e41c3804e42d0a00481821165bf25657a06b9f0 Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" Date: Tue, 12 Jul 2011 18:09:46 +0000 Subject: Clean up users of a deprecated base::LaunchApp API. BUG=88990 Review URL: http://codereview.chromium.org/7258005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92200 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/child_process_launcher.cc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'content/browser') diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc index 8d0ac12..4b49369 100644 --- a/content/browser/child_process_launcher.cc +++ b/content/browser/child_process_launcher.cc @@ -157,7 +157,7 @@ class ChildProcessLauncher::Context #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 @@ -166,12 +166,17 @@ class ChildProcessLauncher::Context // 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; + 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); -- cgit v1.1