Move UTF16ToASCII, remove WideToASCII.

chrome/browser/extensions/external_registry_loader_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/extensions/external_registry_loader_win.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_handle.h"
@@ skipping 68 matching lines @@
     if (key.Open(HKEY_LOCAL_MACHINE,
                  key_path.c_str(), KEY_READ) != ERROR_SUCCESS) {
       if (key.Open(HKEY_CURRENT_USER,
                    key_path.c_str(), KEY_READ) != ERROR_SUCCESS) {
         LOG(ERROR) << "Unable to read registry key at path (HKLM & HKCU): "
                    << key_path << ".";
         continue;
       }
     }
 
-    std::string id = WideToASCII(*it);
+    std::string id = base::UTF16ToASCII(*it);
     StringToLowerASCII(&id);
     if (!Extension::IdIsValid(id)) {
       LOG(ERROR) << "Invalid id value " << id
                  << " for key " << key_path << ".";
       continue;
     }
 
     // If there is an update URL present, copy it to prefs and ignore
     // path and version keys for this entry.
     base::string16 extension_update_url;
     if (key.ReadValue(kRegistryExtensionUpdateUrl, &extension_update_url)
         == ERROR_SUCCESS) {
       prefs->SetString(
           id + "." + ExternalProviderImpl::kExternalUpdateUrl,
-          WideToASCII(extension_update_url));
+          base::UTF16ToASCII(extension_update_url));
       continue;
     }
 
     base::string16 extension_path_str;
     if (key.ReadValue(kRegistryExtensionPath, &extension_path_str)
         != ERROR_SUCCESS) {
       // TODO(erikkay): find a way to get this into about:extensions
       LOG(ERROR) << "Missing value " << kRegistryExtensionPath
                  << " for key " << key_path << ".";
       continue;
@@ skipping 24 matching lines @@
 
     base::string16 extension_version;
     if (key.ReadValue(kRegistryExtensionVersion, &extension_version)
         != ERROR_SUCCESS) {
       // TODO(erikkay): find a way to get this into about:extensions
       LOG(ERROR) << "Missing value " << kRegistryExtensionVersion
                  << " for key " << key_path << ".";
       continue;
     }
 
-    Version version(WideToASCII(extension_version));
+    Version version(base::UTF16ToASCII(extension_version));
     if (!version.IsValid()) {
       LOG(ERROR) << "Invalid version value " << extension_version
                  << " for key " << key_path << ".";
       continue;
     }
 
     prefs->SetString(
         id + "." + ExternalProviderImpl::kExternalVersion,
-        WideToASCII(extension_version));
+        base::UTF16ToASCII(extension_version));
     prefs->SetString(
         id + "." + ExternalProviderImpl::kExternalCrx,
         extension_path_str);
   }
 
   prefs_.reset(prefs.release());
   HISTOGRAM_TIMES("Extensions.ExternalRegistryLoaderWin",
                   base::TimeTicks::Now() - start_time);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&ExternalRegistryLoader::LoadFinished, this));
 }
 
 }  // namespace extensions