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

chrome/installer/util/installer_state.cc

Index: chrome/installer/util/installer_state.cc
diff --git a/chrome/installer/util/installer_state.cc b/chrome/installer/util/installer_state.cc
index 544c53e37bf549094595957d22b65448994dfcdb..500aadce456ddaa2cb025566e1bdb6955bbf54f5 100644
--- a/chrome/installer/util/installer_state.cc
+++ b/chrome/installer/util/installer_state.cc
@@ -293,7 +293,7 @@ void InstallerState::Initialize(const CommandLine& command_line,
   // Parse --critical-update-version=W.X.Y.Z
   std::string critical_version_value(
       command_line.GetSwitchValueASCII(switches::kCriticalUpdateVersion));
-  critical_update_version_ = base::Version(critical_version_value);
+  critical_update_version_ = Version(critical_version_value);
 }
 
 void InstallerState::set_level(Level level) {
@@ -501,10 +501,10 @@ const Product* InstallerState::FindProduct(
   return NULL;
 }
 
-base::Version* InstallerState::GetCurrentVersion(
+Version* InstallerState::GetCurrentVersion(
     const InstallationState& machine_state) const {
   DCHECK(!products_.empty());
-  scoped_ptr<base::Version> current_version;
+  scoped_ptr<Version> current_version;
   // If we're doing a multi-install, the current version may be either an
   // existing multi or an existing single product that is being migrated
   // in place (i.e., Chrome).  In the latter case, there is no existing
@@ -536,7 +536,7 @@ base::Version* InstallerState::GetCurrentVersion(
       machine_state.GetProductState(level_ == SYSTEM_LEVEL, prod_type);
 
   if (product_state != NULL) {
-    const base::Version* version = NULL;
+    const Version* version = NULL;
 
     // Be aware that there might be a pending "new_chrome.exe" already in the
     // installation path.  If so, we use old_version, which holds the version of
@@ -547,15 +547,15 @@ base::Version* InstallerState::GetCurrentVersion(
     if (version == NULL)
       version = &product_state->version();
 
-    current_version.reset(new base::Version(*version));
+    current_version.reset(new Version(*version));
   }
 
   return current_version.release();
 }
 
-base::Version InstallerState::DetermineCriticalVersion(
-    const base::Version* current_version,
-    const base::Version& new_version) const {
+Version InstallerState::DetermineCriticalVersion(
+    const Version* current_version,
+    const Version& new_version) const {
   DCHECK(current_version == NULL || current_version->IsValid());
   DCHECK(new_version.IsValid());
   if (critical_update_version_.IsValid() &&
@@ -564,7 +564,7 @@ base::Version InstallerState::DetermineCriticalVersion(
       new_version.CompareTo(critical_update_version_) >= 0) {
     return critical_update_version_;
   }
-  return base::Version();
+  return Version();
 }
 
 bool InstallerState::IsChromeFrameRunning(
@@ -581,7 +581,7 @@ bool InstallerState::AreBinariesInUse(
 }
 
 base::FilePath InstallerState::GetInstallerDirectory(
-    const base::Version& version) const {
+    const Version& version) const {
   return target_path().Append(base::ASCIIToWide(version.GetString()))
       .Append(kInstallerDir);
 }
@@ -631,7 +631,7 @@ bool InstallerState::AnyExistsAndIsInUse(
   // _from_). Later versions from pending in-use updates need not be checked
   // since the current version is guaranteed to be in use if any such are.
   bool in_use = false;
-  scoped_ptr<base::Version> current_version(GetCurrentVersion(machine_state));
+  scoped_ptr<Version> current_version(GetCurrentVersion(machine_state));
   if (!current_version)
     return false;
   base::FilePath directory(
@@ -668,10 +668,10 @@ void InstallerState::GetExistingExeVersions(
 }
 
 void InstallerState::RemoveOldVersionDirectories(
-    const base::Version& new_version,
-    base::Version* existing_version,
+    const Version& new_version,
+    Version* existing_version,
     const base::FilePath& temp_path) const {
-  base::Version version;
+  Version version;
   scoped_ptr<WorkItem> item;
 
   std::set<std::string> existing_version_strings;
@@ -689,7 +689,7 @@ void InstallerState::RemoveOldVersionDirectories(
   for (base::FilePath next_version = version_enum.Next(); !next_version.empty();
        next_version = version_enum.Next()) {
     base::FilePath dir_name(next_version.BaseName());
-    version = base::Version(WideToASCII(dir_name.value()));
+    version = Version(WideToASCII(dir_name.value()));
     // Delete the version folder if it is less than the new version and not
     // equal to the old version (if we have an old version).
     if (version.IsValid() &&