| Index: chrome/installer/setup/setup_main.cc
|
| diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
|
| index 48fbe5430c9c1a73424cf46c193227c3f15267fc..f0df2e647b6349acc23b452b608b2bf6daae41df 100644
|
| --- a/chrome/installer/setup/setup_main.cc
|
| +++ b/chrome/installer/setup/setup_main.cc
|
| @@ -1091,16 +1091,16 @@ bool HandleNonInstallCmdLineOptions(const InstallationState& original_state,
|
| BrowserDistribution* browser_dist = product->distribution();
|
| // We started as system-level and have been re-launched as user level
|
| // to continue with the toast experiment.
|
| - scoped_ptr<Version> installed_version(
|
| - InstallUtil::GetChromeVersion(browser_dist, true));
|
| - if (!installed_version.get()) {
|
| + Version installed_version;
|
| + InstallUtil::GetChromeVersion(browser_dist, true, &installed_version);
|
| + if (!installed_version.IsValid()) {
|
| LOG(ERROR) << "No installation of "
|
| << browser_dist->GetAppShortCutName()
|
| << " found for system-level toast.";
|
| } else {
|
| browser_dist->LaunchUserExperiment(cmd_line.GetProgram(),
|
| installer::REENTRY_SYS_UPDATE,
|
| - *installed_version, *product, true);
|
| + installed_version, *product, true);
|
| }
|
| }
|
| } else if (cmd_line.HasSwitch(
|
|
|