Consistently use namespaced base::Version in component_updater code.

chrome/browser/component_updater/swiftshader_component_installer.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/swiftshader_component_installer.h"
 
 #include <stdint.h>
 #include <string>
 #include <vector>
 
@@ skipping 45 matching lines @@
   if (!PathService::Get(DIR_SWIFT_SHADER, &result))
     NOTREACHED() << "Couldn't get SwiftShader directory.";
   return result;
 }
 
 // SwiftShader has version encoded in the path itself
 // so we need to enumerate the directories to find the full path.
 // On success it returns something like:
 // <profile>\AppData\Local\Google\Chrome\User Data\SwiftShader\10.3.44.555\.
 bool GetLatestSwiftShaderDirectory(base::FilePath* result,
-                                   Version* latest,
+                                   base::Version* latest,
                                    std::vector<base::FilePath>* older_dirs) {
   base::FilePath base_dir = GetSwiftShaderBaseDirectory();
   bool found = false;
   base::FileEnumerator file_enumerator(
       base_dir, false, base::FileEnumerator::DIRECTORIES);
   for (base::FilePath path = file_enumerator.Next(); !path.value().empty();
        path = file_enumerator.Next()) {
-    Version version(path.BaseName().MaybeAsASCII());
+    base::Version version(path.BaseName().MaybeAsASCII());
     if (!version.IsValid())
       continue;
     if (version.CompareTo(*latest) > 0 &&
         base::PathExists(path.Append(kSwiftShaderEglName)) &&
         base::PathExists(path.Append(kSwiftShaderGlesName))) {
       if (found && older_dirs)
         older_dirs->push_back(*result);
       *latest = version;
       *result = path;
       found = true;
     } else {
       if (older_dirs)
         older_dirs->push_back(path);
     }
   }
   return found;
 }
 
 void RegisterSwiftShaderWithChrome(const base::FilePath& path) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   GpuDataManager::GetInstance()->RegisterSwiftShaderPath(path);
 }
 
 class SwiftShaderComponentInstaller : public update_client::CrxInstaller {
  public:
-  explicit SwiftShaderComponentInstaller(const Version& version);
+  explicit SwiftShaderComponentInstaller(const base::Version& version);
 
   // ComponentInstaller implementation:
   void OnUpdateError(int error) override;
 
   bool Install(const base::DictionaryValue& manifest,
                const base::FilePath& unpack_path) override;
 
   bool GetInstalledFile(const std::string& file,
                         base::FilePath* installed_file) override;
 
   bool Uninstall() override;
 
  private:
   ~SwiftShaderComponentInstaller() override {}
 
-  Version current_version_;
+  base::Version current_version_;
 };
 
 SwiftShaderComponentInstaller::SwiftShaderComponentInstaller(
-    const Version& version)
+    const base::Version& version)
     : current_version_(version) {
   DCHECK(version.IsValid());
 }
 
 void SwiftShaderComponentInstaller::OnUpdateError(int error) {
   NOTREACHED() << "SwiftShader update error: " << error;
 }
 
 bool SwiftShaderComponentInstaller::Install(
     const base::DictionaryValue& manifest,
     const base::FilePath& unpack_path) {
   std::string name;
   manifest.GetStringASCII("name", &name);
   if (name != kSwiftShaderManifestName)
     return false;
   std::string proposed_version;
   manifest.GetStringASCII("version", &proposed_version);
-  Version version(proposed_version.c_str());
+  base::Version version(proposed_version.c_str());
   if (!version.IsValid())
     return false;
   if (current_version_.CompareTo(version) >= 0)
     return false;
   if (!base::PathExists(unpack_path.Append(kSwiftShaderEglName)) ||
       !base::PathExists(unpack_path.Append(kSwiftShaderGlesName)))
     return false;
   // Passed the basic tests. Time to install it.
   base::FilePath path =
       GetSwiftShaderBaseDirectory().AppendASCII(version.GetString());
@@ skipping 13 matching lines @@
     const std::string& file,
     base::FilePath* installed_file) {
   return false;
 }
 
 bool SwiftShaderComponentInstaller::Uninstall() {
   return false;
 }
 
 void FinishSwiftShaderUpdateRegistration(ComponentUpdateService* cus,
-                                         const Version& version) {
+                                         const base::Version& version) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   update_client::CrxComponent swiftshader;
   swiftshader.name = "Swift Shader";
   swiftshader.installer = new SwiftShaderComponentInstaller(version);
   swiftshader.version = version;
   swiftshader.pk_hash.assign(kSha2Hash, &kSha2Hash[sizeof(kSha2Hash)]);
   if (!cus->RegisterComponent(swiftshader)) {
     NOTREACHED() << "SwiftShader component registration fail";
   }
@@ skipping 15 matching lines @@
 void UpdateChecker::OnGpuInfoUpdate() {
   GpuDataManager* gpu_data_manager = GpuDataManager::GetInstance();
 
   if (!gpu_data_manager->GpuAccessAllowed(NULL) ||
       gpu_data_manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL) ||
       gpu_data_manager->ShouldUseSwiftShader()) {
     gpu_data_manager->RemoveObserver(this);
     DCHECK_CURRENTLY_ON(BrowserThread::FILE);
     base::FilePath path = GetSwiftShaderBaseDirectory();
 
-    Version version(kNullVersion);
+    base::Version version(kNullVersion);
     GetLatestSwiftShaderDirectory(&path, &version, NULL);
 
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&FinishSwiftShaderUpdateRegistration, cus_, version));
   }
 }
 
 #if defined(ENABLE_SWIFTSHADER)
 
 // Check if there already is a version of swiftshader installed,
 // and if so register it.
 void RegisterSwiftShaderPath(ComponentUpdateService* cus) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   base::FilePath path = GetSwiftShaderBaseDirectory();
   if (!base::PathExists(path)) {
     if (!base::CreateDirectory(path)) {
       NOTREACHED() << "Could not create SwiftShader directory.";
       return;
     }
   }
 
-  Version version(kNullVersion);
+  base::Version version(kNullVersion);
   std::vector<base::FilePath> older_dirs;
   if (GetLatestSwiftShaderDirectory(&path, &version, &older_dirs))
     BrowserThread::PostTask(BrowserThread::UI,
                             FROM_HERE,
                             base::Bind(&RegisterSwiftShaderWithChrome, path));
 
   UpdateChecker* update_checker = new UpdateChecker(cus);
   GpuDataManager::GetInstance()->AddObserver(update_checker);
   update_checker->OnGpuInfoUpdate();
   // We leak update_checker here, because it has to stick around for the life
@@ skipping 13 matching lines @@
 
 void RegisterSwiftShaderComponent(ComponentUpdateService* cus) {
 #if defined(ENABLE_SWIFTSHADER)
   BrowserThread::PostTask(BrowserThread::FILE,
                           FROM_HERE,
                           base::Bind(&RegisterSwiftShaderPath, cus));
 #endif
 }
 
 }  // namespace component_updater