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

extensions/browser/pending_extension_manager.cc

 // Copyright 2013 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 "extensions/browser/pending_extension_manager.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/version.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/common/extension.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // Install predicate used by AddFromExternalUpdateUrl().
 bool AlwaysInstall(const extensions::Extension* extension) {
   return true;
 }
 
-std::string GetVersionString(const base::Version& version) {
+std::string GetVersionString(const Version& version) {
   return version.IsValid() ? version.GetString() : "invalid";
 }
 
 }  // namespace
 
 namespace extensions {
 
 PendingExtensionManager::PendingExtensionManager(
     const ExtensionServiceInterface& service)
     : service_(service) {
@@ skipping 66 matching lines @@
   // should already be installed on every instance.
   if (id == extension_misc::kWebStoreAppId) {
     NOTREACHED();
     return false;
   }
 
   const bool kIsFromSync = true;
   const Manifest::Location kSyncLocation = Manifest::INTERNAL;
   const bool kMarkAcknowledged = false;
 
-  return AddExtensionImpl(id, update_url, base::Version(), should_allow_install,
+  return AddExtensionImpl(id, update_url, Version(), should_allow_install,
                           kIsFromSync, install_silently, kSyncLocation,
                           Extension::NO_FLAGS, kMarkAcknowledged);
 }
 
 bool PendingExtensionManager::AddFromExtensionImport(
     const std::string& id,
     const GURL& update_url,
     PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (service_.GetInstalledExtension(id)) {
     LOG(ERROR) << "Trying to add pending extension " << id
                << " which already exists";
     return false;
   }
 
   const bool kIsFromSync = false;
   const bool kInstallSilently = true;
   const Manifest::Location kManifestLocation = Manifest::INTERNAL;
   const bool kMarkAcknowledged = false;
 
-  return AddExtensionImpl(id, update_url, base::Version(), should_allow_install,
+  return AddExtensionImpl(id, update_url, Version(), should_allow_install,
                           kIsFromSync, kInstallSilently, kManifestLocation,
                           Extension::NO_FLAGS, kMarkAcknowledged);
 }
 
 bool PendingExtensionManager::AddFromExternalUpdateUrl(
     const std::string& id,
     const GURL& update_url,
     Manifest::Location location,
     int creation_flags,
     bool mark_acknowledged) {
@@ skipping 12 matching lines @@
     if (service_.IsExternalExtensionUninstalled(id))
       return false;
 
     if (extension) {
       LOG(DFATAL) << "Trying to add extension " << id
                   << " by external update, but it is already installed.";
       return false;
     }
   }
 
-  return AddExtensionImpl(id, update_url, base::Version(), &AlwaysInstall,
+  return AddExtensionImpl(id, update_url, Version(), &AlwaysInstall,
                           kIsFromSync, kInstallSilently,
                           location, creation_flags, mark_acknowledged);
 }
 
 
 bool PendingExtensionManager::AddFromExternalFile(
     const std::string& id,
     Manifest::Location install_source,
-    const base::Version& version,
+    const Version& version,
     int creation_flags,
     bool mark_acknowledged) {
   // TODO(skerner): AddFromSync() checks to see if the extension is
   // installed, but this method assumes that the caller already
   // made sure it is not installed.  Make all AddFrom*() methods
   // consistent.
   GURL kUpdateUrl = GURL();
   bool kIsFromSync = false;
   bool kInstallSilently = true;
 
@@ skipping 24 matching lines @@
         install_source == Manifest::EXTERNAL_REGISTRY)
       continue;
 
     out_ids_for_update_check->push_back(iter->id());
   }
 }
 
 bool PendingExtensionManager::AddExtensionImpl(
     const std::string& id,
     const GURL& update_url,
-    const base::Version& version,
+    const Version& version,
     PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install,
     bool is_from_sync,
     bool install_silently,
     Manifest::Location install_source,
     int creation_flags,
     bool mark_acknowledged) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   PendingExtensionInfo info(id,
                             update_url,
@@ skipping 39 matching lines @@
 
   return true;
 }
 
 void PendingExtensionManager::AddForTesting(
     const PendingExtensionInfo& pending_extension_info) {
   pending_extension_list_.push_back(pending_extension_info);
 }
 
 }  // namespace extensions