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