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

chrome/browser/chromeos/extensions/external_cache.cc

 // Copyright (c) 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 "chrome/browser/chromeos/extensions/external_cache.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 323 matching lines @@
     base::DictionaryValue* entry = NULL;
     if (!extensions::Extension::IdIsValid(id)) {
       LOG(ERROR) << "Bad extension id in ExternalCache: " << id;
       id.clear();
     } else if (!prefs->GetDictionary(id, &entry)) {
       LOG(WARNING) << basename << " is in the cache but is not configured by "
                    << "the ExternalCache source, and will be erased.";
       id.clear();
     }
 
-    if (!base::Version(version).IsValid()) {
+    if (!Version(version).IsValid()) {
       LOG(ERROR) << "Bad extension version in ExternalCache: " << version;
       version.clear();
     }
 
     if (id.empty() || version.empty()) {
       LOG(ERROR) << "Invalid file in ExternalCache, erasing: " << basename;
       base::DeleteFile(path, true /* recursive */);
       continue;
     }
 
@@ skipping 14 matching lines @@
                        path.value());
       if (extension_urls::IsWebstoreUpdateUrl(GURL(update_url))) {
         entry->SetBoolean(extensions::ExternalProviderImpl::kIsFromWebstore,
                           true);
       }
     } else if (
         entry->GetString(extensions::ExternalProviderImpl::kExternalVersion,
                          &prev_version_string) &&
         entry->GetString(extensions::ExternalProviderImpl::kExternalCrx,
                          &prev_crx)) {
-      base::Version prev_version(prev_version_string);
-      base::Version curr_version(version);
+      Version prev_version(prev_version_string);
+      Version curr_version(version);
       DCHECK(prev_version.IsValid());
       DCHECK(curr_version.IsValid());
       if (prev_version.CompareTo(curr_version) <= 0) {
         VLOG(1) << "ExternalCache found old cached version "
                 << prev_version_string << " path: " << prev_crx;
         base::FilePath prev_crx_file(prev_crx);
         if (cache_dir.IsParent(prev_crx_file)) {
           // Only delete old cached files under cache_dir_ folder.
           base::DeleteFile(base::FilePath(prev_crx), true /* recursive */);
         }
@@ skipping 74 matching lines @@
   UpdateExtensionLoader();
 }
 
 // static
 void ExternalCache::BackendInstallCacheEntry(
     base::WeakPtr<ExternalCache> external_cache,
     const base::FilePath& cache_dir,
     const std::string& id,
     const base::FilePath& path,
     const std::string& version) {
-  base::Version version_validator(version);
+  Version version_validator(version);
   if (!version_validator.IsValid()) {
     LOG(ERROR) << "ExternalCache downloaded extension " << id << " but got bad "
                << "version: " << version;
     base::DeleteFile(path, true /* recursive */);
     return;
   }
 
   std::string basename = id + "-" + version + kCRXFileExtension;
   base::FilePath cached_crx_path = cache_dir.Append(basename);
 
@@ skipping 68 matching lines @@
                                    FROM_HERE,
                                    callback);
 }
 
 std::string ExternalCache::Delegate::GetInstalledExtensionVersion(
     const std::string& id) {
   return std::string();
 }
 
 }  // namespace chromeos