Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(790)

Unified Diff: chrome/installer/test/alternate_version_generator.cc

Issue 1281313003: base: Remove using:: declaration from version.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fixes Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/setup/uninstall.cc ('k') | chrome/installer/util/browser_distribution.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2e967377664948f03a4fe4e9a0c33141d979c3cc..a2467b917f38afe182baeff5da25be9d22271e8c 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<uint32_t>& 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(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;
@@ -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()
« no previous file with comments | « chrome/installer/setup/uninstall.cc ('k') | chrome/installer/util/browser_distribution.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698