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

chrome/installer/util/installation_state.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/installer/util/installation_state.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/version.h"
 #include "base/win/registry.h"
@@ skipping 42 matching lines @@
 
   // Clear the runway.
   Clear();
 
   // Read from the Clients key.
   if (key.Open(root_key, version_key.c_str(),
                KEY_QUERY_VALUE) == ERROR_SUCCESS) {
     std::wstring version_str;
     if (key.ReadValue(google_update::kRegVersionField,
                       &version_str) == ERROR_SUCCESS) {
-      version_.reset(new base::Version(WideToASCII(version_str)));
+      version_.reset(new Version(WideToASCII(version_str)));
       if (!version_->IsValid())
         version_.reset();
     }
 
     // Attempt to read the other values even if the "pv" version value was
     // absent. Note that ProductState instances containing these values will
     // only be accessible via InstallationState::GetNonVersionedProductState.
     if (key.ReadValue(google_update::kRegOldVersionField,
                       &version_str) == ERROR_SUCCESS) {
-      old_version_.reset(new base::Version(WideToASCII(version_str)));
+      old_version_.reset(new Version(WideToASCII(version_str)));
       if (!old_version_->IsValid())
         old_version_.reset();
     }
 
     key.ReadValue(google_update::kRegRenameCmdField, &rename_cmd_);
     if (!InitializeCommands(key, &commands_))
       commands_.Clear();
   }
 
   // Read from the ClientState key.
@@ skipping 56 matching lines @@
     }
   }
 
   return version_.get() != NULL;
 }
 
 base::FilePath ProductState::GetSetupPath() const {
   return uninstall_command_.GetProgram();
 }
 
-const base::Version& ProductState::version() const {
+const Version& ProductState::version() const {
   DCHECK(version_.get() != NULL);
   return *version_;
 }
 
 ProductState& ProductState::CopyFrom(const ProductState& other) {
   channel_.set_value(other.channel_.value());
-  version_.reset(
-      other.version_.get() ? new base::Version(*other.version_) : NULL);
+  version_.reset(other.version_.get() ? new Version(*other.version_) : NULL);
   old_version_.reset(
-      other.old_version_.get() ? new base::Version(*other.old_version_) : NULL);
+      other.old_version_.get() ? new Version(*other.old_version_) : NULL);
   brand_ = other.brand_;
   rename_cmd_ = other.rename_cmd_;
   uninstall_command_ = other.uninstall_command_;
   oem_install_ = other.oem_install_;
   commands_.CopyFrom(other.commands_);
   eula_accepted_ = other.eula_accepted_;
   usagestats_ = other.usagestats_;
   msi_ = other.msi_;
   multi_install_ = other.multi_install_;
   has_eula_accepted_ = other.has_eula_accepted_;
@@ skipping 98 matching lines @@
 }
 
 const ProductState* InstallationState::GetProductState(
     bool system_install,
     BrowserDistribution::Type type) const {
   const ProductState* product_state =
       GetNonVersionedProductState(system_install, type);
   return product_state->version_.get() == NULL ? NULL : product_state;
 }
 }  // namespace installer