Update all users of base::Version to explicitly specify the namespace, and clean up the header.

BUG=none
TEST=no change
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/100543005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242414 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 10 deletions

diff --git a/extensions/browser/pending_extension_info.cc b/extensions/browser/pending_extension_info.cc
index 0abcdf6..83e6201 100644
--- a/extensions/browser/pending_extension_info.cc
+++ b/extensions/browser/pending_extension_info.cc
@@ -11,7 +11,7 @@ namespace extensions {
 PendingExtensionInfo::PendingExtensionInfo(
     const std::string& id,
     const GURL& update_url,
-    const Version& version,
+    const base::Version& version,
     ShouldAllowInstallPredicate should_allow_install,
     bool is_from_sync,
     bool install_silently,
diff --git a/extensions/browser/pending_extension_info.h b/extensions/browser/pending_extension_info.h
index fd1d3ae..b2eb00f 100644
--- a/extensions/browser/pending_extension_info.h
+++ b/extensions/browser/pending_extension_info.h
@@ -30,7 +30,7 @@ class PendingExtensionInfo {
   PendingExtensionInfo(
       const std::string& id,
       const GURL& update_url,
-      const Version& version,
+      const base::Version& version,
       ShouldAllowInstallPredicate should_allow_install,
       bool is_from_sync,
       bool install_silently,
@@ -46,7 +46,7 @@ class PendingExtensionInfo {
 
   const std::string& id() const { return id_; }
   const GURL& update_url() const { return update_url_; }
-  const Version& version() const { return version_; }
+  const base::Version& version() const { return version_; }
 
   // ShouldAllowInstall() returns the result of running constructor argument
   // |should_allow_install| on an extension. After an extension is unpacked,
@@ -74,7 +74,7 @@ class PendingExtensionInfo {
   std::string id_;
 
   GURL update_url_;
-  Version version_;
+  base::Version version_;
 
   // When the extension is about to be installed, this function is
   // called.  If this function returns true, the install proceeds.  If
diff --git a/extensions/browser/pending_extension_manager.cc b/extensions/browser/pending_extension_manager.cc
index d16b92b..ae74e41 100644
--- a/extensions/browser/pending_extension_manager.cc
+++ b/extensions/browser/pending_extension_manager.cc
@@ -22,7 +22,7 @@ bool AlwaysInstall(const extensions::Extension* extension) {
   return true;
 }
 
-std::string GetVersionString(const Version& version) {
+std::string GetVersionString(const base::Version& version) {
   return version.IsValid() ? version.GetString() : "invalid";
 }
 
@@ -109,7 +109,7 @@ bool PendingExtensionManager::AddFromSync(
   const Manifest::Location kSyncLocation = Manifest::INTERNAL;
   const bool kMarkAcknowledged = false;
 
-  return AddExtensionImpl(id, update_url, Version(), should_allow_install,
+  return AddExtensionImpl(id, update_url, base::Version(), should_allow_install,
                           kIsFromSync, install_silently, kSyncLocation,
                           Extension::NO_FLAGS, kMarkAcknowledged);
 }
@@ -131,7 +131,7 @@ bool PendingExtensionManager::AddFromExtensionImport(
   const Manifest::Location kManifestLocation = Manifest::INTERNAL;
   const bool kMarkAcknowledged = false;
 
-  return AddExtensionImpl(id, update_url, Version(), should_allow_install,
+  return AddExtensionImpl(id, update_url, base::Version(), should_allow_install,
                           kIsFromSync, kInstallSilently, kManifestLocation,
                           Extension::NO_FLAGS, kMarkAcknowledged);
 }
@@ -164,7 +164,7 @@ bool PendingExtensionManager::AddFromExternalUpdateUrl(
     }
   }
 
-  return AddExtensionImpl(id, update_url, Version(), &AlwaysInstall,
+  return AddExtensionImpl(id, update_url, base::Version(), &AlwaysInstall,
                           kIsFromSync, kInstallSilently,
                           location, creation_flags, mark_acknowledged);
 }
@@ -173,7 +173,7 @@ bool PendingExtensionManager::AddFromExternalUpdateUrl(
 bool PendingExtensionManager::AddFromExternalFile(
     const std::string& id,
     Manifest::Location install_source,
-    const Version& version,
+    const base::Version& version,
     int creation_flags,
     bool mark_acknowledged) {
   // TODO(skerner): AddFromSync() checks to see if the extension is
@@ -218,7 +218,7 @@ void PendingExtensionManager::GetPendingIdsForUpdateCheck(
 bool PendingExtensionManager::AddExtensionImpl(
     const std::string& id,
     const GURL& update_url,
-    const Version& version,
+    const base::Version& version,
     PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install,
     bool is_from_sync,
     bool install_silently,