Move UTF16ToASCII, remove WideToASCII.

net/proxy/proxy_config_service_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 "net/proxy/proxy_config_service_win.h"
 
 #include <windows.h>
 #include <winhttp.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/string_tokenizer.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/win/registry.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/proxy_config.h"
 
 #pragma comment(lib, "winhttp.lib")
 
 namespace net {
 
 namespace {
@@ skipping 143 matching lines @@
 
 // static
 void ProxyConfigServiceWin::SetFromIEConfig(
     ProxyConfig* config,
     const WINHTTP_CURRENT_USER_IE_PROXY_CONFIG& ie_config) {
   if (ie_config.fAutoDetect)
     config->set_auto_detect(true);
   if (ie_config.lpszProxy) {
     // lpszProxy may be a single proxy, or a proxy per scheme. The format
     // is compatible with ProxyConfig::ProxyRules's string format.
-    config->proxy_rules().ParseFromString(WideToASCII(ie_config.lpszProxy));
+    config->proxy_rules().ParseFromString(
+        base::UTF16ToASCII(ie_config.lpszProxy));
   }
   if (ie_config.lpszProxyBypass) {
-    std::string proxy_bypass = WideToASCII(ie_config.lpszProxyBypass);
+    std::string proxy_bypass = base::UTF16ToASCII(ie_config.lpszProxyBypass);
 
     base::StringTokenizer proxy_server_bypass_list(proxy_bypass, ";, \t\n\r");
     while (proxy_server_bypass_list.GetNext()) {
       std::string bypass_url_domain = proxy_server_bypass_list.token();
       config->proxy_rules().bypass_rules.AddRuleFromString(bypass_url_domain);
     }
   }
   if (ie_config.lpszAutoConfigUrl)
     config->set_pac_url(GURL(ie_config.lpszAutoConfigUrl));
   config->set_source(PROXY_CONFIG_SOURCE_SYSTEM);
 }
 
 }  // namespace net