Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the hea…

chrome/installer/test/alternate_version_generator.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // The file contains the implementation of the mini_installer re-versioner.
 // The main function (GenerateNextVersion) does the following in a temp dir:
 // - Extracts and unpacks setup.exe and the Chrome-bin folder from
 //   mini_installer.exe.
 // - Inspects setup.exe to determine the current version.
 // - Runs through all .dll and .exe files:
@@ skipping 90 matching lines @@
 };  // class ScopedTempDirectory
 
 // A helper class for manipulating a Chrome product version.
 class ChromeVersion {
  public:
   static ChromeVersion FromHighLow(DWORD high, DWORD low) {
     return ChromeVersion(static_cast<ULONGLONG>(high) << 32 |
                          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 |
                          static_cast<ULONGLONG>(c[1]) << 32 |
                          static_cast<ULONGLONG>(c[2]) << 16 |
                          static_cast<ULONGLONG>(c[3]));
   }
 
   ChromeVersion() { }
   explicit ChromeVersion(ULONGLONG value) : version_(value) { }
@@ skipping 540 matching lines @@
     return false;
   }
   ctx.current_version_str = ctx.current_version.ToString();
 
   if (!IncrementNewVersion(direction, &ctx)) {
     LOG(DFATAL) << "Failed to increment version from \""
                 << original_file.value() << "\"";
     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;
 }
 
 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()
                 << "\" to \"" << target_file.value() << "\"";
     return false;
   }
 
   VisitResourceContext ctx;
   if (!GetFileVersion(target_file, &ctx.current_version)) {
     LOG(DFATAL) << "Failed reading version from \"" << target_file.value()
                 << "\"";
     return false;
   }
   ctx.current_version_str = ctx.current_version.ToString();
   ctx.new_version = ChromeVersion::FromString(version.GetString());
   ctx.new_version_str = ctx.new_version.ToString();
 
   return UpdateVersionIfMatch(target_file, &ctx);
 }
 
 }  // namespace upgrade_test