diff options
| author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-12 05:11:38 +0000 |
|---|---|---|
| committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-12 05:11:38 +0000 |
| commit | 82f954e39c77f4dc20d39c88ca49982a9e48cf94 (patch) | |
| tree | c4f4908b6dacd9ae81070ca080b7fc13b5ebd151 /net/http | |
| parent | bd9b55430689403d9b17fcfe633266c8ad650df4 (diff) | |
| download | chromium_src-82f954e39c77f4dc20d39c88ca49982a9e48cf94.zip chromium_src-82f954e39c77f4dc20d39c88ca49982a9e48cf94.tar.gz chromium_src-82f954e39c77f4dc20d39c88ca49982a9e48cf94.tar.bz2 | |
Change the ProxyService to work with ASCII strings.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_network_transaction.cc | 4 | ||||
| -rw-r--r-- | net/http/http_network_transaction_unittest.cc | 4 | ||||
| -rw-r--r-- | net/http/http_transaction_winhttp.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index 1d45191..56ec449 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -347,7 +347,7 @@ int HttpNetworkTransaction::DoInitConnection() { // Build the string used to uniquely identify connections of this type. std::string connection_group; if (using_proxy_ || using_tunnel_) - connection_group = "proxy/" + proxy_info_.GetProxyServer() + "/"; + connection_group = "proxy/" + proxy_info_.proxy_server() + "/"; if (!using_proxy_) connection_group.append(request_->url.GetOrigin().spec()); @@ -380,7 +380,7 @@ int HttpNetworkTransaction::DoResolveHost() { // Determine the host and port to connect to. if (using_proxy_ || using_tunnel_) { - const std::string& proxy = proxy_info_.GetProxyServer(); + const std::string& proxy = proxy_info_.proxy_server(); StringTokenizer t(proxy, ":"); // TODO(darin): Handle errors here. Perhaps HttpProxyInfo should do this // before claiming a proxy server configuration. diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 600b508..2dc9721 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -176,8 +176,8 @@ class NullProxyResolver : public net::ProxyResolver { virtual int GetProxyConfig(net::ProxyConfig* config) { return net::ERR_FAILED; } - virtual int GetProxyForURL(const std::wstring& query_url, - const std::wstring& pac_url, + virtual int GetProxyForURL(const std::string& query_url, + const std::string& pac_url, net::ProxyInfo* results) { return net::ERR_FAILED; } diff --git a/net/http/http_transaction_winhttp.cc b/net/http/http_transaction_winhttp.cc index 5c49fc7..b946a6d 100644 --- a/net/http/http_transaction_winhttp.cc +++ b/net/http/http_transaction_winhttp.cc @@ -1274,7 +1274,7 @@ int HttpTransactionWinHttp::SendRequest() { if (proxy_info_.is_direct()) connect_peer_ = request_->url.GetOrigin().spec(); else - connect_peer_ = WideToASCII(proxy_info_.proxy_server()); + connect_peer_ = proxy_info_.proxy_server(); DWORD_PTR ctx = reinterpret_cast<DWORD_PTR>(session_callback_.get()); if (!session_->request_throttle()->SubmitRequest(connect_peer_, request_handle_, |