diff options
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/gcapi/gcapi.cc | 3 | ||||
| -rw-r--r-- | chrome/installer/test/alternate_version_generator.cc | 6 | ||||
| -rw-r--r-- | chrome/installer/util/google_update_util.cc | 8 | ||||
| -rw-r--r-- | chrome/installer/util/install_util.cc | 4 |
4 files changed, 11 insertions, 10 deletions
diff --git a/chrome/installer/gcapi/gcapi.cc b/chrome/installer/gcapi/gcapi.cc index ce03d85..f08d90f 100644 --- a/chrome/installer/gcapi/gcapi.cc +++ b/chrome/installer/gcapi/gcapi.cc @@ -519,8 +519,7 @@ BOOL __stdcall LaunchGoogleChrome() { // Couldn't get Omaha's process launcher, Omaha may not be installed at // system level. Try just running Chrome instead. ret = base::LaunchProcess(chrome_command.GetCommandLineString(), - base::LaunchOptions(), - NULL); + base::LaunchOptions()).IsValid(); } if (impersonation_success) diff --git a/chrome/installer/test/alternate_version_generator.cc b/chrome/installer/test/alternate_version_generator.cc index 0d505c8..fd66c01 100644 --- a/chrome/installer/test/alternate_version_generator.cc +++ b/chrome/installer/test/alternate_version_generator.cc @@ -214,13 +214,13 @@ bool MappedFile::Initialize(base::File file) { bool RunProcessAndWait(const wchar_t* exe_path, const std::wstring& cmdline, int* exit_code) { bool result = true; - base::win::ScopedHandle process; base::LaunchOptions options; options.wait = true; options.start_hidden = true; - if (base::LaunchProcess(cmdline, options, &process)) { + base::Process process = base::LaunchProcess(cmdline, options); + if (process.IsValid()) { if (exit_code) { - if (!GetExitCodeProcess(process.Get(), + if (!GetExitCodeProcess(process.Handle(), reinterpret_cast<DWORD*>(exit_code))) { PLOG(DFATAL) << "Failed getting the exit code for \"" << cmdline << "\"."; diff --git a/chrome/installer/util/google_update_util.cc b/chrome/installer/util/google_update_util.cc index 68e4675..db07f84 100644 --- a/chrome/installer/util/google_update_util.cc +++ b/chrome/installer/util/google_update_util.cc @@ -89,13 +89,13 @@ bool GetUserLevelGoogleUpdateInstallCommandLine(base::string16* cmd_string) { bool LaunchProcessAndWaitWithTimeout(const base::string16& cmd_string, base::TimeDelta timeout) { bool success = false; - base::win::ScopedHandle process; int exit_code = 0; VLOG(0) << "Launching: " << cmd_string; - if (!base::LaunchProcess(cmd_string, base::LaunchOptions(), - &process)) { + base::Process process = + base::LaunchProcess(cmd_string, base::LaunchOptions()); + if (!process.IsValid()) { PLOG(ERROR) << "Failed to launch (" << cmd_string << ")"; - } else if (!base::WaitForExitCodeWithTimeout(process.Get(), &exit_code, + } else if (!base::WaitForExitCodeWithTimeout(process.Handle(), &exit_code, timeout)) { // The GetExitCodeProcess failed or timed-out. LOG(ERROR) <<"Command (" << cmd_string << ") is taking more than " diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc index ae96bed..22905ef 100644 --- a/chrome/installer/util/install_util.cc +++ b/chrome/installer/util/install_util.cc @@ -156,7 +156,9 @@ void InstallUtil::TriggerActiveSetupCommand() { base::LaunchOptions launch_options; if (base::win::IsMetroProcess()) launch_options.force_breakaway_from_job_ = true; - if (!base::LaunchProcess(cmd.GetCommandLineString(), launch_options, NULL)) + base::Process process = + base::LaunchProcess(cmd.GetCommandLineString(), launch_options); + if (!process.IsValid()) PLOG(ERROR) << cmd.GetCommandLineString(); } |