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

chrome/browser/component_updater/component_updater_service.cc

 // Copyright (c) 2012 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/component_updater/component_updater_service.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 55 matching lines @@
       id.append(1, val + 'a');
     } else {
       id.append(1, 'a');
     }
   }
   DCHECK(extensions::Extension::IdIsValid(id));
   return id;
 }
 
 // Returns true if the |proposed| version is newer than |current| version.
-bool IsVersionNewer(const Version& current, const std::string& proposed) {
-  Version proposed_ver(proposed);
+bool IsVersionNewer(const base::Version& current, const std::string& proposed) {
+  base::Version proposed_ver(proposed);
   return proposed_ver.IsValid() && current.CompareTo(proposed_ver) < 0;
 }
 
 // Helper template class that allows our main class to have separate
 // OnURLFetchComplete() callbacks for different types of url requests
 // they are differentiated by the |Ctx| type.
 template <typename Del, typename Ctx>
 class DelegateWithContext : public net::URLFetcherDelegate {
  public:
   DelegateWithContext(Del* delegate, Ctx* context)
@@ skipping 234 matching lines @@
   scoped_ptr<CrxDownloader> crx_downloader_;
 
   // A collection of every work item.
   typedef std::vector<CrxUpdateItem*> UpdateItems;
   UpdateItems work_items_;
 
   base::OneShotTimer<CrxUpdateService> timer_;
 
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
 
-  const Version chrome_version_;
+  const base::Version chrome_version_;
 
   bool running_;
 
   DISALLOW_COPY_AND_ASSIGN(CrxUpdateService);
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 CrxUpdateService::CrxUpdateService(ComponentUpdateService::Configurator* config)
     : config_(config),
@@ skipping 388 matching lines @@
                         app_attributes.c_str(),
                         item->component.fingerprint.c_str());
 
   update_check_items->append(app);
 
   ChangeItemState(item, CrxUpdateItem::kChecking);
   item->last_check = base::Time::Now();
   item->crx_urls.clear();
   item->crx_diffurls.clear();
   item->previous_version = item->component.version;
-  item->next_version = Version();
+  item->next_version = base::Version();
   item->previous_fp = item->component.fingerprint;
   item->next_fp.clear();
   item->diff_update_failed = false;
   item->error_category = 0;
   item->error_code = 0;
   item->extra_code1 = 0;
   item->diff_error_category = 0;
   item->diff_error_code = 0;
   item->diff_extra_code1 = 0;
   item->download_metrics.clear();
@@ skipping 90 matching lines @@
       }
     }
 
     if (it->manifest.packages.size() != 1) {
       // Assume one and only one package per component.
       ChangeItemState(crx, CrxUpdateItem::kNoUpdate);
       continue;
     }
 
     // Parse the members of the result and queue an upgrade for this component.
-    crx->next_version = Version(it->manifest.version);
+    crx->next_version = base::Version(it->manifest.version);
 
     typedef component_updater::
         UpdateResponse::Result::Manifest::Package Package;
     const Package& package(it->manifest.packages[0]);
     crx->next_fp = package.fingerprint;
 
     // Resolve the urls by combining the base urls with the package names.
     for (size_t i = 0; i != it->crx_urls.size(); ++i) {
       const GURL url(it->crx_urls[i].Resolve(package.name));
       if (url.is_valid())
@@ skipping 242 matching lines @@
 }
 
 // The component update factory. Using the component updater as a singleton
 // is the job of the browser process.
 ComponentUpdateService* ComponentUpdateServiceFactory(
     ComponentUpdateService::Configurator* config) {
   DCHECK(config);
   return new CrxUpdateService(config);
 }