| Index: chrome/browser/ui/views/about_chrome_view.cc
|
| diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc
|
| index 1b9766527ef415f8777eb871d7f79f5eaa5b7b23..b532f417d588da243fd4e2f943327a9d35daf193 100644
|
| --- a/chrome/browser/ui/views/about_chrome_view.cc
|
| +++ b/chrome/browser/ui/views/about_chrome_view.cc
|
| @@ -700,16 +700,15 @@ void AboutChromeView::UpdateStatus(GoogleUpdateUpgradeResult result,
|
| BrowserDistribution* dist = BrowserDistribution::GetDistribution();
|
| base::ThreadRestrictions::ScopedAllowIO allow_io;
|
| chrome::VersionInfo version_info;
|
| - scoped_ptr<Version> installed_version(
|
| - InstallUtil::GetChromeVersion(dist, false));
|
| - if (!installed_version.get()) {
|
| + Version installed_version;
|
| + InstallUtil::GetChromeVersion(dist, false, &installed_version);
|
| + if (!installed_version.IsValid()) {
|
| // User-level Chrome is not installed, check system-level.
|
| - installed_version.reset(InstallUtil::GetChromeVersion(dist, true));
|
| + InstallUtil::GetChromeVersion(dist, true, &installed_version);
|
| }
|
| - scoped_ptr<Version> running_version(
|
| - Version::GetVersionFromString(version_info.Version()));
|
| - if (!installed_version.get() ||
|
| - (installed_version->CompareTo(*running_version) <= 0)) {
|
| + Version running_version(version_info.Version());
|
| + if (!installed_version.IsValid() ||
|
| + (installed_version.CompareTo(running_version) <= 0)) {
|
| content::RecordAction(
|
| UserMetricsAction("UpgradeCheck_AlreadyUpToDate"));
|
| string16 update_label_text = l10n_util::GetStringFUTF16(
|
|
|