Update browser/first_run to use the new version of LaunchProcess.

BUG=417532

Review URL: https://codereview.chromium.org/785373002

Cr-Commit-Position: refs/heads/master@{#308369}

chrome/browser/first_run/first_run_internal_win.cc

@@ -46,7 +46,6 @@ bool LaunchSetupForEula(const base::FilePath::StringType& value,
     return false;
   exe_dir = exe_dir.Append(installer::kInstallerDir);
   base::FilePath exe_path = exe_dir.Append(installer::kSetupExe);
-  base::ProcessHandle ph;
 
   CommandLine cl(CommandLine::NO_PROGRAM);
   cl.AppendSwitchNative(installer::switches::kShowEula, value);
@@ -67,11 +66,11 @@ bool LaunchSetupForEula(const base::FilePath::StringType& value,
     CommandLine setup_path(exe_path);
     setup_path.AppendArguments(cl, false);
 
+    base::Process process =
+        base::LaunchProcess(setup_path, base::LaunchOptions());
     int exit_code = 0;
-    if (!base::LaunchProcess(setup_path, base::LaunchOptions(), &ph) ||
-        !base::WaitForExitCode(ph, &exit_code)) {
+    if (!process.IsValid() || !process.WaitForExit(&exit_code))
       return false;
-    }
 
     *ret_code = exit_code;
     return true;

chrome/browser/first_run/upgrade_util_win.cc

@@ -159,7 +159,7 @@ bool RelaunchChromeHelper(const CommandLine& command_line,
       relaunch_mode != RELAUNCH_MODE_METRO &&
       relaunch_mode != RELAUNCH_MODE_DESKTOP)
     return base::LaunchProcess(chrome_exe_command_line,
-                               base::LaunchOptions(), NULL);
+                               base::LaunchOptions()).IsValid();
 
   // On Windows 8 we always use the delegate_execute for re-launching chrome.
   // On Windows 7 we use delegate_execute for re-launching chrome into Windows