| Index: chrome/installer/test/alternate_version_generator.cc
|
| diff --git a/chrome/installer/test/alternate_version_generator.cc b/chrome/installer/test/alternate_version_generator.cc
|
| index b50e02603f5d68050fef771c546e0e047236e54c..ac3f053ec976309c50edb77799eef46cef8b95f3 100644
|
| --- a/chrome/installer/test/alternate_version_generator.cc
|
| +++ b/chrome/installer/test/alternate_version_generator.cc
|
| @@ -112,7 +112,7 @@ class ChromeVersion {
|
| static_cast<ULONGLONG>(low));
|
| }
|
| static ChromeVersion FromString(const std::string& version_string) {
|
| - Version version(version_string);
|
| + base::Version version(version_string);
|
| DCHECK(version.IsValid());
|
| const std::vector<uint32_t>& c(version.components());
|
| return ChromeVersion(static_cast<ULONGLONG>(c[0]) << 48 |
|
| @@ -740,7 +740,7 @@ bool GenerateAlternatePEFileVersion(const base::FilePath& original_file,
|
| return false;
|
| }
|
|
|
| - Version new_version(base::UTF16ToASCII(ctx.new_version_str));
|
| + base::Version new_version(base::UTF16ToASCII(ctx.new_version_str));
|
| GenerateSpecificPEFileVersion(original_file, target_file, new_version);
|
|
|
| return true;
|
| @@ -748,7 +748,7 @@ bool GenerateAlternatePEFileVersion(const base::FilePath& original_file,
|
|
|
| bool GenerateSpecificPEFileVersion(const base::FilePath& original_file,
|
| const base::FilePath& target_file,
|
| - const Version& version) {
|
| + const base::Version& version) {
|
| // First copy original_file to target_file.
|
| if (!base::CopyFile(original_file, target_file)) {
|
| LOG(DFATAL) << "Failed copying \"" << original_file.value()
|
|
|