summaryrefslogtreecommitdiffstats
path: root/chrome/installer/test
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-23 23:37:00 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-23 23:37:00 +0000
commit140905c70becf18808f2ad9d55d6efc00cb96461 (patch)
treec8a71d1149012d01bfd91c59740704d164d82b81 /chrome/installer/test
parent8f3cf5f5413e223a40fddc111759536df1400893 (diff)
downloadchromium_src-140905c70becf18808f2ad9d55d6efc00cb96461.zip
chromium_src-140905c70becf18808f2ad9d55d6efc00cb96461.tar.gz
chromium_src-140905c70becf18808f2ad9d55d6efc00cb96461.tar.bz2
Update all users of base::Version to explicitly specify the namespace, and clean up the header.
BUG=none TEST=no change TBR=ben@chromium.org Review URL: https://codereview.chromium.org/100543005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242414 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/test')
-rw-r--r--chrome/installer/test/alternate_version_generator.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/installer/test/alternate_version_generator.cc b/chrome/installer/test/alternate_version_generator.cc
index 6b65aa1..f9606ff 100644
--- a/chrome/installer/test/alternate_version_generator.cc
+++ b/chrome/installer/test/alternate_version_generator.cc
@@ -108,7 +108,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<uint16>& c(version.components());
return ChromeVersion(static_cast<ULONGLONG>(c[0]) << 48 |
@@ -669,7 +669,7 @@ bool GenerateAlternatePEFileVersion(const base::FilePath& original_file,
return false;
}
- Version new_version(WideToASCII(ctx.new_version_str));
+ base::Version new_version(WideToASCII(ctx.new_version_str));
GenerateSpecificPEFileVersion(original_file, target_file, new_version);
return true;
@@ -677,7 +677,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()