base: Remove using:: declaration from version.h header.

BUG=None
R=brettw@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#344088}

21 files changed, 75 insertions, 75 deletions

diff --git a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
index 8a61cde..ea9f431 100644
--- a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
+++ b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
@@ -251,9 +251,10 @@ void ChromeRuntimeAPIDelegate::Observe(
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == extensions::NOTIFICATION_EXTENSION_UPDATE_FOUND);
-  typedef const std::pair<std::string, Version> UpdateDetails;
+  typedef const std::pair<std::string, base::Version> UpdateDetails;
   const std::string& id = content::Details<UpdateDetails>(details)->first;
-  const Version& version = content::Details<UpdateDetails>(details)->second;
+  const base::Version& version =
+      content::Details<UpdateDetails>(details)->second;
   if (version.IsValid()) {
     CallUpdateCallbacks(
         id, UpdateCheckResult(true, kUpdateFound, version.GetString()));
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
index eace973..9240e7b 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -307,7 +307,7 @@ bool ChromeExtensionsBrowserClient::IsMinBrowserVersionSupported(
     const std::string& min_version) {
   base::Version browser_version =
       base::Version(version_info::GetVersionNumber());
-  Version browser_min_version(min_version);
+  base::Version browser_min_version(min_version);
   if (browser_version.IsValid() && browser_min_version.IsValid() &&
       browser_min_version.CompareTo(browser_version) > 0) {
     return false;
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index 2effb1a..4899cf2 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -154,7 +154,7 @@ CrxInstaller::CrxInstaller(base::WeakPtr<ExtensionService> service_weak,
     expected_id_ = approval->extension_id;
   }
   if (approval->minimum_version.get()) {
-    expected_version_.reset(new Version(*approval->minimum_version));
+    expected_version_.reset(new base::Version(*approval->minimum_version));
     expected_version_strict_checking_ = false;
   }
 
@@ -483,7 +483,7 @@ void CrxInstaller::CheckInstall() {
         SharedModuleInfo::GetImports(extension());
     std::vector<SharedModuleInfo::ImportInfo>::const_iterator i;
     for (i = imports.begin(); i != imports.end(); ++i) {
-      Version version_required(i->minimum_version);
+      base::Version version_required(i->minimum_version);
       const Extension* imported_module =
           service->GetExtensionById(i->extension_id, true);
       if (imported_module &&
@@ -684,7 +684,7 @@ void CrxInstaller::CompleteInstall() {
   DCHECK(installer_task_runner_->RunsTasksOnCurrentThread());
 
   if (!current_version_.empty()) {
-    Version current_version(current_version_);
+    base::Version current_version(current_version_);
     if (current_version.CompareTo(*(extension()->version())) > 0) {
       ReportFailureFromFileThread(CrxInstallError(
           CrxInstallError::ERROR_DECLINED,
diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h
index 43b54f2..1cf576a 100644
--- a/chrome/browser/extensions/crx_installer.h
+++ b/chrome/browser/extensions/crx_installer.h
@@ -133,8 +133,8 @@ class CrxInstaller
   bool hash_check_failed() const { return hash_check_failed_; }
   void set_hash_check_failed(bool val) { hash_check_failed_ = val; }
 
-  void set_expected_version(const Version& val) {
-    expected_version_.reset(new Version(val));
+  void set_expected_version(const base::Version& val) {
+    expected_version_.reset(new base::Version(val));
     expected_version_strict_checking_ = true;
   }
 
@@ -326,7 +326,7 @@ class CrxInstaller
   // installing.  Important for external sources, where claiming the wrong
   // version could cause unnecessary unpacking of an extension at every
   // restart.
-  scoped_ptr<Version> expected_version_;
+  scoped_ptr<base::Version> expected_version_;
 
   // If true, the actual version should be same with the |expected_version_|,
   // Otherwise the actual version should be equal to or newer than
diff --git a/chrome/browser/extensions/extension_management_internal.cc b/chrome/browser/extensions/extension_management_internal.cc
index df1bbe7..0e78408 100644
--- a/chrome/browser/extensions/extension_management_internal.cc
+++ b/chrome/browser/extensions/extension_management_internal.cc
@@ -136,7 +136,7 @@ bool IndividualSettings::Parse(const base::DictionaryValue* dict,
           schema_constants::kMinimumVersionRequired,
           &minimum_version_required_str)) {
     scoped_ptr<base::Version> version(
-        new Version(minimum_version_required_str));
+        new base::Version(minimum_version_required_str));
     // We accept a general version string here. Note that count of components in
     // version string of extensions is limited to 4.
     if (!version->IsValid())
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 3ed9706..bdfb333 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -1563,7 +1563,7 @@ void ExtensionService::AddExtension(const Extension* extension) {
 void ExtensionService::AddComponentExtension(const Extension* extension) {
   const std::string old_version_string(
       extension_prefs_->GetVersionString(extension->id()));
-  const Version old_version(old_version_string);
+  const base::Version old_version(old_version_string);
 
   VLOG(1) << "AddComponentExtension " << extension->name();
   if (!old_version.IsValid() || !old_version.Equals(*extension->version())) {
@@ -2134,13 +2134,13 @@ const Extension* ExtensionService::GetInstalledExtension(
 }
 
 bool ExtensionService::OnExternalExtensionFileFound(
-         const std::string& id,
-         const Version* version,
-         const base::FilePath& path,
-         Manifest::Location location,
-         int creation_flags,
-         bool mark_acknowledged,
-         bool install_immediately) {
+    const std::string& id,
+    const base::Version* version,
+    const base::FilePath& path,
+    Manifest::Location location,
+    int creation_flags,
+    bool mark_acknowledged,
+    bool install_immediately) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   CHECK(crx_file::id_util::IdIsValid(id));
   if (extension_prefs_->IsExternalExtensionUninstalled(id))
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index eb56fbb..66433c1 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -276,7 +276,7 @@ class MockExtensionProvider : public extensions::ExternalProviderInterface {
     visit_count_++;
     for (DataMap::const_iterator i = extension_map_.begin();
          i != extension_map_.end(); ++i) {
-      Version version(i->second.first);
+      base::Version version(i->second.first);
 
       visitor_->OnExternalExtensionFileFound(
           i->first, &version, i->second.second, location_,
@@ -291,13 +291,13 @@ class MockExtensionProvider : public extensions::ExternalProviderInterface {
 
   bool GetExtensionDetails(const std::string& id,
                            Manifest::Location* location,
-                           scoped_ptr<Version>* version) const override {
+                           scoped_ptr<base::Version>* version) const override {
     DataMap::const_iterator it = extension_map_.find(id);
     if (it == extension_map_.end())
       return false;
 
     if (version)
-      version->reset(new Version(it->second.first));
+      version->reset(new base::Version(it->second.first));
 
     if (location)
       *location = location_;
@@ -384,7 +384,7 @@ class MockProviderVisitor
   }
 
   bool OnExternalExtensionFileFound(const std::string& id,
-                                    const Version* version,
+                                    const base::Version* version,
                                     const base::FilePath& path,
                                     Manifest::Location unused,
                                     int creation_flags,
@@ -409,13 +409,13 @@ class MockProviderVisitor
 
       // Ask provider if the extension we got back is registered.
       Manifest::Location location = Manifest::INVALID_LOCATION;
-      scoped_ptr<Version> v1;
+      scoped_ptr<base::Version> v1;
       base::FilePath crx_path;
 
       EXPECT_TRUE(provider_->GetExtensionDetails(id, NULL, &v1));
       EXPECT_STREQ(version->GetString().c_str(), v1->GetString().c_str());
 
-      scoped_ptr<Version> v2;
+      scoped_ptr<base::Version> v2;
       EXPECT_TRUE(provider_->GetExtensionDetails(id, &location, &v2));
       EXPECT_STREQ(version->GetString().c_str(), v1->GetString().c_str());
       EXPECT_STREQ(version->GetString().c_str(), v2->GetString().c_str());
@@ -446,7 +446,7 @@ class MockProviderVisitor
       EXPECT_TRUE(provider_->HasExtension(id));
 
       // External extensions with update URLs do not have versions.
-      scoped_ptr<Version> v1;
+      scoped_ptr<base::Version> v1;
       Manifest::Location location1 = Manifest::INVALID_LOCATION;
       EXPECT_TRUE(provider_->GetExtensionDetails(id, &location1, &v1));
       EXPECT_FALSE(v1.get());
@@ -1573,7 +1573,7 @@ TEST_F(ExtensionServiceTest, InstallingExternalExtensionWithFlags) {
   service()->set_extensions_enabled(true);
 
   // Register and install an external extension.
-  Version version("1.0.0.0");
+  base::Version version("1.0.0.0");
   content::WindowedNotificationObserver observer(
       extensions::NOTIFICATION_CRX_INSTALLER_DONE,
       content::NotificationService::AllSources());
@@ -1610,7 +1610,7 @@ TEST_F(ExtensionServiceTest, UninstallingExternalExtensions) {
   service()->set_extensions_enabled(true);
 
   // Install an external extension.
-  Version version("1.0.0.0");
+  base::Version version("1.0.0.0");
   content::WindowedNotificationObserver observer(
       extensions::NOTIFICATION_CRX_INSTALLER_DONE,
       content::NotificationService::AllSources());
@@ -1644,7 +1644,7 @@ TEST_F(ExtensionServiceTest, UninstallingExternalExtensions) {
   ValidateIntegerPref(good_crx, "state",
                       Extension::EXTERNAL_EXTENSION_UNINSTALLED);
 
-  version = Version("1.0.0.1");
+  version = base::Version("1.0.0.1");
   // Repeat the same thing with a newer version of the extension.
   path = data_dir().AppendASCII("good2.crx");
   service()->OnExternalExtensionFileFound(good_crx,
@@ -1704,7 +1704,7 @@ TEST_F(ExtensionServiceTest, FailOnWrongId) {
   base::FilePath path = data_dir().AppendASCII("good.crx");
   service()->set_extensions_enabled(true);
 
-  Version version("1.0.0.0");
+  base::Version version("1.0.0.0");
 
   const std::string wrong_id = all_zero;
   const std::string correct_id = good_crx;
@@ -1750,7 +1750,7 @@ TEST_F(ExtensionServiceTest, FailOnWrongVersion) {
 
   // Install an external extension with a version from the external
   // source that is not equal to the version in the extension manifest.
-  Version wrong_version("1.2.3.4");
+  base::Version wrong_version("1.2.3.4");
   content::WindowedNotificationObserver observer(
       extensions::NOTIFICATION_CRX_INSTALLER_DONE,
       content::NotificationService::AllSources());
@@ -1767,7 +1767,7 @@ TEST_F(ExtensionServiceTest, FailOnWrongVersion) {
 
   // Try again with the right version. Expect success.
   service()->pending_extension_manager()->Remove(good_crx);
-  Version correct_version("1.0.0.0");
+  base::Version correct_version("1.0.0.0");
   content::WindowedNotificationObserver observer2(
       extensions::NOTIFICATION_CRX_INSTALLER_DONE,
       content::NotificationService::AllSources());
@@ -3190,7 +3190,7 @@ TEST_F(ExtensionServiceTest, UpdatePendingExtensionAlreadyInstalled) {
       good->id(),
       std::string(),
       extensions::ManifestURL::GetUpdateURL(good),
-      Version(),
+      base::Version(),
       &IsExtension,
       kGoodIsFromSync,
       Manifest::INTERNAL,
@@ -7254,8 +7254,8 @@ TEST_F(ExtensionServiceTest, InstallPriorityExternalUpdateUrl) {
 }
 
 TEST_F(ExtensionServiceTest, InstallPriorityExternalLocalFile) {
-  Version older_version("0.1.0.0");
-  Version newer_version("2.0.0.0");
+  base::Version older_version("0.1.0.0");
+  base::Version newer_version("2.0.0.0");
 
   // We don't want the extension to be installed.  A path that doesn't
   // point to a valid CRX ensures this.
@@ -7487,9 +7487,9 @@ TEST_F(ExtensionServiceTest, InstallPriorityExternalLocalFile) {
 }
 
 TEST_F(ExtensionServiceTest, ConcurrentExternalLocalFile) {
-  Version kVersion123("1.2.3");
-  Version kVersion124("1.2.4");
-  Version kVersion125("1.2.5");
+  base::Version kVersion123("1.2.3");
+  base::Version kVersion124("1.2.4");
+  base::Version kVersion125("1.2.5");
   const base::FilePath kInvalidPathToCrx(FILE_PATH_LITERAL("invalid_path"));
   const int kCreationFlags = 0;
   const bool kDontMarkAcknowledged = false;
@@ -7616,7 +7616,7 @@ class ExtensionSourcePriorityTest : public ExtensionServiceTest {
 
   // Fake an external file from external_extensions.json.
   bool AddPendingExternalPrefFileInstall() {
-    Version version("1.0.0.0");
+    base::Version version("1.0.0.0");
 
     return service()->OnExternalExtensionFileFound(crx_id_,
                                                    &version,
diff --git a/chrome/browser/extensions/extension_sync_data.cc b/chrome/browser/extensions/extension_sync_data.cc
index 6404e8b..af98c86 100644
--- a/chrome/browser/extensions/extension_sync_data.cc
+++ b/chrome/browser/extensions/extension_sync_data.cc
@@ -236,7 +236,7 @@ bool ExtensionSyncData::PopulateFromExtensionSpecifics(
     return false;
   }
 
-  Version specifics_version(specifics.version());
+  base::Version specifics_version(specifics.version());
   if (!specifics_version.IsValid()) {
     LOG(ERROR) << "Attempt to sync bad ExtensionSpecifics (bad version):\n"
                << GetExtensionSpecificsLogMessage(specifics);
diff --git a/chrome/browser/extensions/extension_sync_data.h b/chrome/browser/extensions/extension_sync_data.h
index 2c753f3..d2d7342 100644
--- a/chrome/browser/extensions/extension_sync_data.h
+++ b/chrome/browser/extensions/extension_sync_data.h
@@ -96,7 +96,7 @@ class ExtensionSyncData {
 
   // Version-dependent properties (i.e., should be used only when the
   // version of the currently-installed extension matches |version|).
-  const Version& version() const { return version_; }
+  const base::Version& version() const { return version_; }
   const GURL& update_url() const { return update_url_; }
   // Used only for debugging.
   const std::string& name() const { return name_; }
@@ -154,7 +154,7 @@ class ExtensionSyncData {
   bool remote_install_;
   OptionalBoolean all_urls_enabled_;
   bool installed_by_custodian_;
-  Version version_;
+  base::Version version_;
   GURL update_url_;
   std::string name_;
 
diff --git a/chrome/browser/extensions/extension_sync_data_unittest.cc b/chrome/browser/extensions/extension_sync_data_unittest.cc
index bae256f..9b5fd82 100644
--- a/chrome/browser/extensions/extension_sync_data_unittest.cc
+++ b/chrome/browser/extensions/extension_sync_data_unittest.cc
@@ -110,7 +110,7 @@ TEST_F(ExtensionSyncDataTest, ExtensionSyncDataForExtension) {
   EXPECT_FALSE(extension_sync_data.remote_install());
   EXPECT_EQ(ExtensionSyncData::BOOLEAN_TRUE,
             extension_sync_data.all_urls_enabled());
-  EXPECT_TRUE(Version(kVersion).Equals(extension_sync_data.version()));
+  EXPECT_TRUE(base::Version(kVersion).Equals(extension_sync_data.version()));
   EXPECT_EQ(std::string(kName), extension_sync_data.name());
 
   // Check the serialize-deserialize process for ExtensionSyncData to proto.
diff --git a/chrome/browser/extensions/external_policy_loader_unittest.cc b/chrome/browser/extensions/external_policy_loader_unittest.cc
index 11e7448..3b150dd 100644
--- a/chrome/browser/extensions/external_policy_loader_unittest.cc
+++ b/chrome/browser/extensions/external_policy_loader_unittest.cc
@@ -70,7 +70,7 @@ class MockExternalPolicyProviderVisitor
   }
 
   bool OnExternalExtensionFileFound(const std::string& id,
-                                    const Version* version,
+                                    const base::Version* version,
                                     const base::FilePath& path,
                                     Manifest::Location unused,
                                     int unused2,
@@ -91,7 +91,7 @@ class MockExternalPolicyProviderVisitor
 
     // Provider returns the correct location when asked.
     Manifest::Location location1;
-    scoped_ptr<Version> version1;
+    scoped_ptr<base::Version> version1;
     provider_->GetExtensionDetails(id, &location1, &version1);
     EXPECT_EQ(Manifest::EXTERNAL_POLICY_DOWNLOAD, location1);
     EXPECT_FALSE(version1.get());
diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc
index 7844bca..dea7367 100644
--- a/chrome/browser/extensions/external_provider_impl.cc
+++ b/chrome/browser/extensions/external_provider_impl.cc
@@ -285,7 +285,7 @@ void ExternalProviderImpl::SetPrefs(base::DictionaryValue* prefs) {
         path = base_path.Append(external_crx);
       }
 
-      Version version(external_version);
+      base::Version version(external_version);
       if (!version.IsValid()) {
         LOG(WARNING) << "Malformed extension dictionary for extension: "
                      << extension_id.c_str() << ".  Invalid version string \""
@@ -347,8 +347,9 @@ bool ExternalProviderImpl::HasExtension(
 }
 
 bool ExternalProviderImpl::GetExtensionDetails(
-    const std::string& id, Manifest::Location* location,
-    scoped_ptr<Version>* version) const {
+    const std::string& id,
+    Manifest::Location* location,
+    scoped_ptr<base::Version>* version) const {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   CHECK(prefs_.get());
   CHECK(ready_);
@@ -368,7 +369,7 @@ bool ExternalProviderImpl::GetExtensionDetails(
       return false;
 
     if (version)
-      version->reset(new Version(external_version));
+      version->reset(new base::Version(external_version));
 
   } else {
     NOTREACHED();  // Chrome should not allow prefs to get into this state.
@@ -389,9 +390,9 @@ bool ExternalProviderImpl::HandleMinProfileVersion(
   if (profile_ &&
       extension->GetString(kMinProfileCreatedByVersion,
                            &min_profile_created_by_version)) {
-    Version profile_version(
+    base::Version profile_version(
         profile_->GetPrefs()->GetString(prefs::kProfileCreatedByVersion));
-    Version min_version(min_profile_created_by_version);
+    base::Version min_version(min_profile_created_by_version);
     if (min_version.IsValid() && profile_version.CompareTo(min_version) < 0) {
       unsupported_extensions->insert(extension_id);
       VLOG(1) << "Skip installing (or uninstall) external extension: "
diff --git a/chrome/browser/extensions/external_registry_loader_win.cc b/chrome/browser/extensions/external_registry_loader_win.cc
index 0b5a67f..0f45a8a 100644
--- a/chrome/browser/extensions/external_registry_loader_win.cc
+++ b/chrome/browser/extensions/external_registry_loader_win.cc
@@ -164,7 +164,7 @@ void ExternalRegistryLoader::LoadOnFileThread() {
       continue;
     }
 
-    Version version(base::UTF16ToASCII(extension_version));
+    base::Version version(base::UTF16ToASCII(extension_version));
     if (!version.IsValid()) {
       LOG(ERROR) << "Invalid version value " << extension_version
                  << " for key " << key_path << ".";
diff --git a/chrome/browser/extensions/pending_extension_info.cc b/chrome/browser/extensions/pending_extension_info.cc
index 94a5608..9501f95 100644
--- a/chrome/browser/extensions/pending_extension_info.cc
+++ b/chrome/browser/extensions/pending_extension_info.cc
@@ -12,7 +12,7 @@ PendingExtensionInfo::PendingExtensionInfo(
     const std::string& id,
     const std::string& install_parameter,
     const GURL& update_url,
-    const Version& version,
+    const base::Version& version,
     ShouldAllowInstallPredicate should_allow_install,
     bool is_from_sync,
     Manifest::Location install_source,
diff --git a/chrome/browser/extensions/pending_extension_info.h b/chrome/browser/extensions/pending_extension_info.h
index 8ac52c5..98bb35a 100644
--- a/chrome/browser/extensions/pending_extension_info.h
+++ b/chrome/browser/extensions/pending_extension_info.h
@@ -30,7 +30,7 @@ class PendingExtensionInfo {
   PendingExtensionInfo(const std::string& id,
                        const std::string& install_parameter,
                        const GURL& update_url,
-                       const Version& version,
+                       const base::Version& version,
                        ShouldAllowInstallPredicate should_allow_install,
                        bool is_from_sync,
                        Manifest::Location install_source,
@@ -48,7 +48,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_; }
   const std::string& install_parameter() const { return install_parameter_; }
 
   // ShouldAllowInstall() returns the result of running constructor argument
@@ -77,7 +77,7 @@ class PendingExtensionInfo {
   std::string id_;
 
   GURL update_url_;
-  Version version_;
+  base::Version version_;
   std::string install_parameter_;
 
   // When the extension is about to be installed, this function is
diff --git a/chrome/browser/extensions/pending_extension_manager.cc b/chrome/browser/extensions/pending_extension_manager.cc
index 7d05462..2958ed1 100644
--- a/chrome/browser/extensions/pending_extension_manager.cc
+++ b/chrome/browser/extensions/pending_extension_manager.cc
@@ -25,7 +25,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";
 }
 
@@ -121,7 +121,7 @@ bool PendingExtensionManager::AddFromSync(
   return AddExtensionImpl(id,
                           std::string(),
                           update_url,
-                          Version(),
+                          base::Version(),
                           should_allow_install,
                           kIsFromSync,
                           kSyncLocation,
@@ -151,7 +151,7 @@ bool PendingExtensionManager::AddFromExtensionImport(
   return AddExtensionImpl(id,
                           std::string(),
                           update_url,
-                          Version(),
+                          base::Version(),
                           should_allow_install,
                           kIsFromSync,
                           kManifestLocation,
@@ -192,7 +192,7 @@ bool PendingExtensionManager::AddFromExternalUpdateUrl(
   return AddExtensionImpl(id,
                           install_parameter,
                           update_url,
-                          Version(),
+                          base::Version(),
                           &AlwaysInstall,
                           kIsFromSync,
                           location,
@@ -201,11 +201,10 @@ bool PendingExtensionManager::AddFromExternalUpdateUrl(
                           kRemoteInstall);
 }
 
-
 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
@@ -253,7 +252,7 @@ bool PendingExtensionManager::AddExtensionImpl(
     const std::string& id,
     const std::string& install_parameter,
     const GURL& update_url,
-    const Version& version,
+    const base::Version& version,
     PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install,
     bool is_from_sync,
     Manifest::Location install_source,
diff --git a/chrome/browser/extensions/unpacked_installer.cc b/chrome/browser/extensions/unpacked_installer.cc
index 6fd2f9b..2a0976d 100644
--- a/chrome/browser/extensions/unpacked_installer.cc
+++ b/chrome/browser/extensions/unpacked_installer.cc
@@ -214,7 +214,7 @@ void UnpackedInstaller::StartInstallChecks() {
           SharedModuleInfo::GetImports(extension());
       std::vector<SharedModuleInfo::ImportInfo>::const_iterator i;
       for (i = imports.begin(); i != imports.end(); ++i) {
-        Version version_required(i->minimum_version);
+        base::Version version_required(i->minimum_version);
         const Extension* imported_module =
             service->GetExtensionById(i->extension_id, true);
         if (!imported_module) {
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc
index 7c27862..8541b77 100644
--- a/chrome/browser/extensions/updater/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc
@@ -434,7 +434,7 @@ void SetupPendingExtensionManagerForTest(
         PendingExtensionInfo(id,
                              std::string(),
                              update_url,
-                             Version(),
+                             base::Version(),
                              should_allow_install,
                              kIsFromSync,
                              Manifest::INTERNAL,
@@ -1168,7 +1168,7 @@ class ExtensionUpdaterTest : public testing::Test {
 
     std::string id = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
     std::string hash;
-    Version version("0.0.1");
+    base::Version version("0.0.1");
     std::set<int> requests;
     requests.insert(0);
     scoped_ptr<ExtensionDownloader::ExtensionFetch> fetch(
@@ -1278,7 +1278,7 @@ class ExtensionUpdaterTest : public testing::Test {
     GURL test_url(base::StringPrintf("%s/extension.crx", url_prefix.c_str()));
     std::string id = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
     std::string hash;
-  Version version("0.0.1");
+    base::Version version("0.0.1");
     std::set<int> requests;
     requests.insert(0);
     scoped_ptr<ExtensionDownloader::ExtensionFetch> fetch(
diff --git a/chrome/browser/extensions/updater/local_extension_cache.cc b/chrome/browser/extensions/updater/local_extension_cache.cc
index e265b8c..8d9f851 100644
--- a/chrome/browser/extensions/updater/local_extension_cache.cc
+++ b/chrome/browser/extensions/updater/local_extension_cache.cc
@@ -133,8 +133,8 @@ bool LocalExtensionCache::NewerOrSame(const CacheMap::iterator& entry,
                                       const std::string& version,
                                       const std::string& expected_hash,
                                       int* compare) {
-  Version new_version(version);
-  Version prev_version(entry->second.version);
+  base::Version new_version(version);
+  base::Version prev_version(entry->second.version);
   int cmp = new_version.CompareTo(prev_version);
 
   if (compare)
@@ -157,7 +157,7 @@ void LocalExtensionCache::PutExtension(const std::string& id,
     return;
   }
 
-  Version version_validator(version);
+  base::Version version_validator(version);
   if (!version_validator.IsValid()) {
     LOG(ERROR) << "Extension " << id << " has bad version " << version;
     callback.Run(file_path, true);
@@ -443,7 +443,7 @@ void LocalExtensionCache::BackendCheckCacheContentsInternal(
       id.clear();
     }
 
-    if (!Version(version).IsValid()) {
+    if (!base::Version(version).IsValid()) {
       LOG(ERROR) << "Bad extension version in cache: " << version;
       version.clear();
     }
diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc
index 6ab5475..53ce4dd 100644
--- a/chrome/browser/extensions/webstore_installer.cc
+++ b/chrome/browser/extensions/webstore_installer.cc
@@ -418,7 +418,7 @@ void WebstoreInstaller::OnExtensionInstalled(
     CHECK_EQ(extension->id(), id_);
     ReportSuccess();
   } else {
-    const Version version_required(info.minimum_version);
+    const base::Version version_required(info.minimum_version);
     if (version_required.IsValid() &&
         extension->version()->CompareTo(version_required) < 0) {
       // It should not happen, CrxInstaller will make sure the version is
@@ -490,11 +490,10 @@ void WebstoreInstaller::OnDownloadStarted(
     scoped_ptr<Approval> approval = Approval::CreateForSharedModule(profile_);
     const SharedModuleInfo::ImportInfo& info = pending_modules_.front();
     approval->extension_id = info.extension_id;
-    const Version version_required(info.minimum_version);
+    const base::Version version_required(info.minimum_version);
 
     if (version_required.IsValid()) {
-      approval->minimum_version.reset(
-          new Version(version_required));
+      approval->minimum_version.reset(new base::Version(version_required));
     }
     download_item_->SetUserData(kApprovalKey, approval.release());
   } else {
diff --git a/chrome/browser/extensions/webstore_installer.h b/chrome/browser/extensions/webstore_installer.h
index 58e76fa..48aa236 100644
--- a/chrome/browser/extensions/webstore_installer.h
+++ b/chrome/browser/extensions/webstore_installer.h
@@ -158,7 +158,7 @@ class WebstoreInstaller : public content::NotificationObserver,
     scoped_refptr<Extension> dummy_extension;
 
     // Required minimum version.
-    scoped_ptr<Version> minimum_version;
+    scoped_ptr<base::Version> minimum_version;
 
     // Ephemeral apps are transiently installed.
     bool is_ephemeral;