Chromium Code Reviews| Index: jingle/glue/proxy_resolving_client_socket.cc |
| diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc |
| index 92f9e5ec38393dbc245500bde08699e2730ad97b..fb2df2904745c6be872037c2a7d35a8cb73c08ef 100644 |
| --- a/jingle/glue/proxy_resolving_client_socket.cc |
| +++ b/jingle/glue/proxy_resolving_client_socket.cc |
| @@ -132,20 +132,21 @@ int ProxyResolvingClientSocket::SetSendBufferSize(int32_t size) { |
| int ProxyResolvingClientSocket::Connect( |
| const net::CompletionCallback& callback) { |
| DCHECK(user_connect_callback_.is_null()); |
| tried_direct_connect_fallback_ = false; |
| // First we try and resolve the proxy. |
| int status = network_session_->proxy_service()->ResolveProxy( |
| proxy_url_, |
| + std::string(), |
|
bengr
2016/02/26 23:43:33
#include <string>
|
| net::LOAD_NORMAL, |
| &proxy_info_, |
| proxy_resolve_callback_, |
| &pac_request_, |
| NULL, |
| bound_net_log_); |
| if (status != net::ERR_IO_PENDING) { |
| // We defer execution of ProcessProxyResolveDone instead of calling it |
| // directly here for simplicity. From the caller's point of view, |
| // the connect always happens asynchronously. |
| @@ -283,21 +284,21 @@ int ProxyResolvingClientSocket::ReconsiderProxyAfterError(int error) { |
| default: |
| return error; |
| } |
| if (proxy_info_.is_https() && ssl_config_.send_client_cert) { |
| network_session_->ssl_client_auth_cache()->Remove( |
| proxy_info_.proxy_server().host_port_pair()); |
| } |
| int rv = network_session_->proxy_service()->ReconsiderProxyAfterError( |
| - proxy_url_, net::LOAD_NORMAL, error, &proxy_info_, |
| + proxy_url_, std::string(), net::LOAD_NORMAL, error, &proxy_info_, |
| proxy_resolve_callback_, &pac_request_, NULL, bound_net_log_); |
| if (rv == net::OK || rv == net::ERR_IO_PENDING) { |
| CloseTransportSocket(); |
| } else { |
| // If ReconsiderProxyAfterError() failed synchronously, it means |
| // there was nothing left to fall-back to, so fail the transaction |
| // with the last connection error we got. |
| rv = error; |
| } |