Change base::LaunchProcess API slightly

chrome/browser/first_run/first_run_win.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/browser/first_run/first_run.h"
 
 #include <shlobj.h>
 #include <windows.h>
 
 #include <set>
@@ skipping 127 matching lines @@
   exe_path = exe_path.Append(installer::kSetupExe);
   base::ProcessHandle ph;
   CommandLine cl(exe_path);
   cl.AppendSwitchNative(param, value);
 
   CommandLine* browser_command_line = CommandLine::ForCurrentProcess();
   if (browser_command_line->HasSwitch(switches::kChromeFrame)) {
     cl.AppendSwitch(switches::kChromeFrame);
   }
 
-  base::LaunchOptions options;
-  options.process_handle = &ph;
-  if (!base::LaunchProcess(cl, options))
+  // TODO(evan): should this use options.wait = true?
+  if (!base::LaunchProcess(cl, base::LaunchOptions(), &ph))
     return false;
   DWORD wr = ::WaitForSingleObject(ph, INFINITE);
   if (wr != WAIT_OBJECT_0)
     return false;
   return (TRUE == ::GetExitCodeProcess(ph, reinterpret_cast<DWORD*>(ret_code)));
 }
 
 bool FirstRun::WriteEULAtoTempFile(FilePath* eula_path) {
   base::StringPiece terms =
       ResourceBundle::GetSharedInstance().GetRawDataResource(IDR_TERMS_HTML);
@@ skipping 176 matching lines @@
                            skip_first_run_ui ? 1 : 0, NULL));
   }
 
   if (!import_bookmarks_path.empty()) {
     import_cmd.CommandLine::AppendSwitchPath(
         switches::kImportFromFile, import_bookmarks_path);
   }
 
   // Time to launch the process that is going to do the import.
   base::ProcessHandle import_process;
-  base::LaunchOptions options;
-  options.process_handle = &import_process;
-  if (!base::LaunchProcess(import_cmd, options))
+  if (!base::LaunchProcess(import_cmd, base::LaunchOptions(), &import_process))
     return false;
 
   // We block inside the import_runner ctor, pumping messages until the
   // importer process ends. This can happen either by completing the import
   // or by hang_monitor killing it.
   ImportProcessRunner import_runner(import_process);
 
   // Import process finished. Reload the prefs, because importer may set
   // the pref value.
   if (profile)
@@ skipping 47 matching lines @@
       parent_window,
       static_cast<uint16>(items_to_import),
       importer_host,
       &importer_observer,
       importer_list->GetSourceProfileForImporterType(importer_type),
       profile,
       true);
   importer_observer.RunLoop();
   return importer_observer.import_result();
 }