| Index: chrome/installer/util/install_util.cc
|
| diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc
|
| index c2d1102101332872e7aeac7980c0d24f13a0c4a7..433f36371591d611b3a23f073277b543f09df19f 100644
|
| --- a/chrome/installer/util/install_util.cc
|
| +++ b/chrome/installer/util/install_util.cc
|
| @@ -214,7 +214,7 @@ CommandLine InstallUtil::GetChromeUninstallCmd(
|
|
|
| void InstallUtil::GetChromeVersion(BrowserDistribution* dist,
|
| bool system_install,
|
| - base::Version* version) {
|
| + Version* version) {
|
| DCHECK(dist);
|
| RegKey key;
|
| HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
|
| @@ -225,11 +225,11 @@ void InstallUtil::GetChromeVersion(BrowserDistribution* dist,
|
| if (result == ERROR_SUCCESS)
|
| result = key.ReadValue(google_update::kRegVersionField, &version_str);
|
|
|
| - *version = base::Version();
|
| + *version = Version();
|
| if (result == ERROR_SUCCESS && !version_str.empty()) {
|
| VLOG(1) << "Existing " << dist->GetDisplayName() << " version found "
|
| << version_str;
|
| - *version = base::Version(WideToASCII(version_str));
|
| + *version = Version(WideToASCII(version_str));
|
| } else {
|
| DCHECK_EQ(ERROR_FILE_NOT_FOUND, result);
|
| VLOG(1) << "No existing " << dist->GetDisplayName()
|
| @@ -239,7 +239,7 @@ void InstallUtil::GetChromeVersion(BrowserDistribution* dist,
|
|
|
| void InstallUtil::GetCriticalUpdateVersion(BrowserDistribution* dist,
|
| bool system_install,
|
| - base::Version* version) {
|
| + Version* version) {
|
| DCHECK(dist);
|
| RegKey key;
|
| HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
|
| @@ -251,11 +251,11 @@ void InstallUtil::GetCriticalUpdateVersion(BrowserDistribution* dist,
|
| result = key.ReadValue(google_update::kRegCriticalVersionField,
|
| &version_str);
|
|
|
| - *version = base::Version();
|
| + *version = Version();
|
| if (result == ERROR_SUCCESS && !version_str.empty()) {
|
| VLOG(1) << "Critical Update version for " << dist->GetDisplayName()
|
| << " found " << version_str;
|
| - *version = base::Version(WideToASCII(version_str));
|
| + *version = Version(WideToASCII(version_str));
|
| } else {
|
| DCHECK_EQ(ERROR_FILE_NOT_FOUND, result);
|
| VLOG(1) << "No existing " << dist->GetDisplayName()
|
|
|