| Index: net/proxy/proxy_config_service_win.cc
|
| diff --git a/net/proxy/proxy_config_service_win.cc b/net/proxy/proxy_config_service_win.cc
|
| index a1295f33de81bfdb49246abe4cb532255f0b0873..828b5cca52408c34a89a01735703c1019bee8187 100644
|
| --- a/net/proxy/proxy_config_service_win.cc
|
| +++ b/net/proxy/proxy_config_service_win.cc
|
| @@ -12,6 +12,7 @@
|
| #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"
|
| @@ -175,10 +176,11 @@ void ProxyConfigServiceWin::SetFromIEConfig(
|
| 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()) {
|
|
|