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

This is a speculative revert of r242414.

BUG=330681
TEST=as in bug
TBR=ben@chromium.org

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

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

5 files changed, 15 insertions, 14 deletions

diff --git a/chrome/browser/plugins/plugin_finder.cc b/chrome/browser/plugins/plugin_finder.cc
index 23ece21..31f6db5 100644
--- a/chrome/browser/plugins/plugin_finder.cc
+++ b/chrome/browser/plugins/plugin_finder.cc
@@ -119,7 +119,7 @@ PluginMetadata* CreatePluginMetadata(
           PluginMetadata::SECURITY_STATUS_UP_TO_DATE;
       success = PluginMetadata::ParseSecurityStatus(status_str, &status);
       DCHECK(success);
-      plugin->AddVersion(base::Version(version), status);
+      plugin->AddVersion(Version(version), status);
     }
   }
 
diff --git a/chrome/browser/plugins/plugin_installer.h b/chrome/browser/plugins/plugin_installer.h
index e3cf859..abcfe6f 100644
--- a/chrome/browser/plugins/plugin_installer.h
+++ b/chrome/browser/plugins/plugin_installer.h
@@ -7,6 +7,7 @@
 
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
+#include "base/version.h"
 #include "chrome/browser/plugins/plugin_metadata.h"
 #include "content/public/browser/download_item.h"
 #include "net/base/net_errors.h"
diff --git a/chrome/browser/plugins/plugin_metadata.cc b/chrome/browser/plugins/plugin_metadata.cc
index f0fc6d4..33f83a0 100644
--- a/chrome/browser/plugins/plugin_metadata.cc
+++ b/chrome/browser/plugins/plugin_metadata.cc
@@ -39,7 +39,7 @@ PluginMetadata::PluginMetadata(const std::string& identifier,
 PluginMetadata::~PluginMetadata() {
 }
 
-void PluginMetadata::AddVersion(const base::Version& version,
+void PluginMetadata::AddVersion(const Version& version,
                                 SecurityStatus status) {
   DCHECK(versions_.find(version) == versions_.end());
   versions_[version] = status;
@@ -97,14 +97,14 @@ PluginMetadata::SecurityStatus PluginMetadata::GetSecurityStatus(
     return SECURITY_STATUS_REQUIRES_AUTHORIZATION;
   }
 
-  base::Version version;
+  Version version;
   content::WebPluginInfo::CreateVersionFromString(plugin.version, &version);
   if (!version.IsValid())
-    version = base::Version("0");
+    version = Version("0");
 
   // |lower_bound| returns the latest version that is not newer than |version|.
-  std::map<base::Version, SecurityStatus, VersionComparator>::
-      const_iterator it = versions_.lower_bound(version);
+  std::map<Version, SecurityStatus, VersionComparator>::const_iterator it =
+      versions_.lower_bound(version);
   // If there is at least one version defined, everything older than the oldest
   // defined version is considered out-of-date.
   if (it == versions_.end())
@@ -113,8 +113,8 @@ PluginMetadata::SecurityStatus PluginMetadata::GetSecurityStatus(
   return it->second;
 }
 
-bool PluginMetadata::VersionComparator::operator() (
-    const base::Version& lhs, const base::Version& rhs) const {
+bool PluginMetadata::VersionComparator::operator() (const Version& lhs,
+                                                    const Version& rhs) const {
   // Keep versions ordered by newest (biggest) first.
   return lhs.CompareTo(rhs) > 0;
 }
diff --git a/chrome/browser/plugins/plugin_metadata.h b/chrome/browser/plugins/plugin_metadata.h
index de49b28..261e6e8 100644
--- a/chrome/browser/plugins/plugin_metadata.h
+++ b/chrome/browser/plugins/plugin_metadata.h
@@ -67,7 +67,7 @@ class PluginMetadata {
   void AddMatchingMimeType(const std::string& mime_type);
 
   // Adds information about a plug-in version.
-  void AddVersion(const base::Version& version, SecurityStatus status);
+  void AddVersion(const Version& version, SecurityStatus status);
 
   // Checks if |plugin| mime types match all |matching_mime_types_|.
   // If there is no |matching_mime_types_|, |group_name_matcher_| is used
@@ -87,7 +87,7 @@ class PluginMetadata {
 
  private:
   struct VersionComparator {
-    bool operator() (const base::Version& lhs, const base::Version& rhs) const;
+    bool operator() (const Version& lhs, const Version& rhs) const;
   };
 
   std::string identifier_;
@@ -97,7 +97,7 @@ class PluginMetadata {
   GURL plugin_url_;
   GURL help_url_;
   std::string language_;
-  std::map<base::Version, SecurityStatus, VersionComparator> versions_;
+  std::map<Version, SecurityStatus, VersionComparator> versions_;
   std::vector<std::string> all_mime_types_;
   std::vector<std::string> matching_mime_types_;
 
diff --git a/chrome/browser/plugins/plugin_metadata_unittest.cc b/chrome/browser/plugins/plugin_metadata_unittest.cc
index dd5ac8a..03d57a7 100644
--- a/chrome/browser/plugins/plugin_metadata_unittest.cc
+++ b/chrome/browser/plugins/plugin_metadata_unittest.cc
@@ -41,9 +41,9 @@ TEST(PluginMetadataTest, SecurityStatus) {
   EXPECT_EQ(kRequiresAuthorization,
             GetSecurityStatus(&plugin_metadata, "1.2.3"));
 
-  plugin_metadata.AddVersion(base::Version("9.4.1"), kRequiresAuthorization);
-  plugin_metadata.AddVersion(base::Version("10"), kOutOfDate);
-  plugin_metadata.AddVersion(base::Version("10.2.1"), kUpToDate);
+  plugin_metadata.AddVersion(Version("9.4.1"), kRequiresAuthorization);
+  plugin_metadata.AddVersion(Version("10"), kOutOfDate);
+  plugin_metadata.AddVersion(Version("10.2.1"), kUpToDate);
 
   // Invalid version.
   EXPECT_EQ(kOutOfDate, GetSecurityStatus(&plugin_metadata, "foo"));