Move UTF16ToASCII, remove WideToASCII.

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.
-    Version module_version(UTF16ToASCII(module.version));
+    Version module_version(base::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);
@@ skipping 239 matching lines @@
   env_vars.push_back(L"ProgramFiles");
   env_vars.push_back(L"ProgramData");
   env_vars.push_back(L"USERPROFILE");
   env_vars.push_back(L"SystemRoot");
   env_vars.push_back(L"TEMP");
   env_vars.push_back(L"TMP");
   env_vars.push_back(L"CommonProgramFiles");
   for (std::vector<base::string16>::const_iterator variable = env_vars.begin();
        variable != env_vars.end(); ++variable) {
     std::string path;
-    if (environment->GetVar(WideToASCII(*variable).c_str(), &path)) {
+    if (environment->GetVar(base::UTF16ToASCII(*variable).c_str(), &path)) {
       path_mapping_.push_back(
           std::make_pair(base::i18n::ToLower(base::UTF8ToUTF16(path)) + L"\\",
                          L"%" + base::i18n::ToLower(*variable) + L"%"));
     }
   }
 }
 
 void ModuleEnumerator::CollapsePath(Module* entry) {
   // Take the path and see if we can use any of the substitution values
   // from the vector constructed above to replace c:\windows with, for
@@ skipping 405 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));
 }