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

BUG=88990

Review URL: http://codereview.chromium.org/7351003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92598 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 7 deletions

diff --git a/content/browser/zygote_host_linux.cc b/content/browser/zygote_host_linux.cc
index e4c04ae..fb5da59 100644
--- a/content/browser/zygote_host_linux.cc
+++ b/content/browser/zygote_host_linux.cc
@@ -298,18 +298,17 @@ void ZygoteHost::AdjustRendererOOMScore(base::ProcessHandle pid, int score) {
   }
 
   if (using_suid_sandbox_ && !selinux) {
-    base::ProcessHandle sandbox_helper_process;
     std::vector<std::string> adj_oom_score_cmdline;
-
     adj_oom_score_cmdline.push_back(sandbox_binary_);
     adj_oom_score_cmdline.push_back(base::kAdjustOOMScoreSwitch);
     adj_oom_score_cmdline.push_back(base::Int64ToString(pid));
     adj_oom_score_cmdline.push_back(base::IntToString(score));
-    CommandLine adj_oom_score_cmd(adj_oom_score_cmdline);
-    if (base::LaunchApp(adj_oom_score_cmd, false, true,
-                        &sandbox_helper_process)) {
+
+    base::ProcessHandle sandbox_helper_process;
+    base::LaunchOptions options;
+    options.process_handle = &sandbox_helper_process;
+    if (base::LaunchProcess(adj_oom_score_cmdline, options))
       ProcessWatcher::EnsureProcessGetsReaped(sandbox_helper_process);
-    }
   } else if (!using_suid_sandbox_) {
     if (!base::AdjustOOMScore(pid, score))
       PLOG(ERROR) << "Failed to adjust OOM score of renderer with pid " << pid;
diff --git a/content/common/sandbox_policy.cc b/content/common/sandbox_policy.cc
index 7841120..2eb189f 100644
--- a/content/common/sandbox_policy.cc
+++ b/content/common/sandbox_policy.cc
@@ -400,7 +400,9 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line,
 
   if (!in_sandbox) {
     policy->Release();
-    base::LaunchApp(*cmd_line, false, false, &process);
+    base::LaunchOptions options;
+    options.process_handle = &process;
+    base::LaunchProcess(*cmd_line, options);
     return process;
   }