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

chrome/browser/enumerate_modules_model_win.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/enumerate_modules_model_win.h"
 
 #include <Tlhelp32.h>
 #include <wintrust.h>
 #include <algorithm>
 
@@ skipping 366 matching lines @@
   std::string filename_hash, location_hash;
   GenerateHash(base::WideToUTF8(module.name), &filename_hash);
   GenerateHash(base::WideToUTF8(module.location), &location_hash);
 
   // Filenames are mandatory. Location is mandatory if given.
   if (filename_hash == blacklisted.filename &&
           (std::string(blacklisted.location).empty() ||
           location_hash == blacklisted.location)) {
     // We have a name match against the blacklist (and possibly location match
     // also), so check version.
-    base::Version module_version(UTF16ToASCII(module.version));
-    base::Version version_min(blacklisted.version_from);
-    base::Version version_max(blacklisted.version_to);
+    Version module_version(UTF16ToASCII(module.version));
+    Version version_min(blacklisted.version_from);
+    Version version_max(blacklisted.version_to);
     bool version_ok = !version_min.IsValid() && !version_max.IsValid();
     if (!version_ok) {
       bool too_low = version_min.IsValid() &&
           (!module_version.IsValid() ||
           module_version.CompareTo(version_min) < 0);
       bool too_high = version_max.IsValid() &&
           (!module_version.IsValid() ||
           module_version.CompareTo(version_max) >= 0);
       version_ok = !too_low && !too_high;
     }
@@ skipping 663 matching lines @@
   GenerateHash(base::WideToUTF8(module.location), &location);
   GenerateHash(base::WideToUTF8(module.description), &description);
   GenerateHash(base::WideToUTF8(module.digital_signer), &signer);
 
   base::string16 url =
       l10n_util::GetStringFUTF16(IDS_HELP_CENTER_VIEW_CONFLICTS,
           base::ASCIIToUTF16(filename), base::ASCIIToUTF16(location),
           base::ASCIIToUTF16(description), base::ASCIIToUTF16(signer));
   return GURL(base::UTF16ToUTF8(url));
 }