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

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 "base/base_paths.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/cpu.h"
@@ skipping 42 matching lines @@
   base::FilePath result;
   PathService::Get(chrome::DIR_USER_DATA, &result);
   return result.Append(kSwiftShaderBaseDirectory);
 }
 
 // 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,
-                                   base::Version* latest,
+                                   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()) {
-    base::Version version(path.BaseName().MaybeAsASCII());
+    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(BrowserThread::CurrentlyOn(BrowserThread::UI));
   GpuDataManager::GetInstance()->RegisterSwiftShaderPath(path);
 }
 
 }  // namespace
 
 class SwiftShaderComponentInstaller : public ComponentInstaller {
  public:
-  explicit SwiftShaderComponentInstaller(const base::Version& version);
+  explicit SwiftShaderComponentInstaller(const Version& version);
 
   virtual ~SwiftShaderComponentInstaller() {}
 
   virtual void OnUpdateError(int error) OVERRIDE;
 
   virtual bool Install(const base::DictionaryValue& manifest,
                        const base::FilePath& unpack_path) OVERRIDE;
 
   virtual bool GetInstalledFile(const std::string& file,
                                 base::FilePath* installed_file) OVERRIDE;
 
  private:
-  base::Version current_version_;
+  Version current_version_;
 };
 
 SwiftShaderComponentInstaller::SwiftShaderComponentInstaller(
-    const base::Version& version) : current_version_(version) {
+    const 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);
-  base::Version version(proposed_version.c_str());
+  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());
   if (base::PathExists(path))
     return false;
   if (!base::Move(unpack_path, path))
     return false;
   // Installation is done. Now tell the rest of chrome.
   current_version_ = version;
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       base::Bind(&RegisterSwiftShaderWithChrome, path));
   return true;
 }
 
 bool SwiftShaderComponentInstaller::GetInstalledFile(
     const std::string& file, base::FilePath* installed_file) {
   return false;
 }
 
 void FinishSwiftShaderUpdateRegistration(ComponentUpdateService* cus,
-                                         const base::Version& version) {
+                                         const Version& version) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   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) != ComponentUpdateService::kOk) {
     NOTREACHED() << "SwiftShader component registration fail";
   }
@@ skipping 16 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(BrowserThread::CurrentlyOn(BrowserThread::FILE));
     base::FilePath path = GetSwiftShaderBaseDirectory();
 
-    base::Version version(kNullVersion);
+    Version version(kNullVersion);
     GetLatestSwiftShaderDirectory(&path, &version, NULL);
 
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&FinishSwiftShaderUpdateRegistration, cus_, version));
   }
 }
 
 // Check if there already is a version of swiftshader installed,
 // and if so register it.
 void RegisterSwiftShaderPath(ComponentUpdateService* cus) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   base::FilePath path = GetSwiftShaderBaseDirectory();
   if (!base::PathExists(path)) {
     if (!base::CreateDirectory(path)) {
       NOTREACHED() << "Could not create SwiftShader directory.";
       return;
     }
   }
 
-  base::Version version(kNullVersion);
+  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
   // of the GpuDataManager.
 
   // Remove older versions of SwiftShader.
   for (std::vector<base::FilePath>::iterator iter = older_dirs.begin();
        iter != older_dirs.end(); ++iter) {
     base::DeleteFile(*iter, true);
   }
 }
 
 void RegisterSwiftShaderComponent(ComponentUpdateService* cus) {
 #if defined(ENABLE_SWIFTSHADER)
   base::CPU cpu;
 
   if (!cpu.has_sse2())
     return;
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&RegisterSwiftShaderPath, cus));
 #endif
 }