summaryrefslogtreecommitdiffstats
path: root/chrome/installer/test
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-03 16:06:13 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-03 16:06:13 +0000
commitc5e4a2224ab96a7380e768c6a6148985accd3488 (patch)
tree993cafd3bd7514df75ff773879d3633ee916e3f8 /chrome/installer/test
parent3bc2e375275d2e3a2aa0d8766d8e17f766ddbf78 (diff)
downloadchromium_src-c5e4a2224ab96a7380e768c6a6148985accd3488.zip
chromium_src-c5e4a2224ab96a7380e768c6a6148985accd3488.tar.gz
chromium_src-c5e4a2224ab96a7380e768c6a6148985accd3488.tar.bz2
Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the header."
This is a speculative revert of r242414. BUG=330681 TEST=as in bug TBR=ben@chromium.org Review URL: https://codereview.chromium.org/109673004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242889 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 f9606ff..6b65aa1 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) {
- base::Version version(version_string);
+ 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;
}
- base::Version new_version(WideToASCII(ctx.new_version_str));
+ 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 base::Version& version) {
+ const Version& version) {
// First copy original_file to target_file.
if (!base::CopyFile(original_file, target_file)) {
LOG(DFATAL) << "Failed copying \"" << original_file.value()