Chromium Code Reviews| Index: jingle/notifier/base/proxy_resolving_client_socket.cc |
| =================================================================== |
| --- jingle/notifier/base/proxy_resolving_client_socket.cc (revision 117986) |
| +++ jingle/notifier/base/proxy_resolving_client_socket.cc (working copy) |
| @@ -20,6 +20,18 @@ |
| namespace notifier { |
| +namespace { |
| + |
| +void HandleProxyTunnelAuth(const net::HttpResponseInfo& response_info, |
| + net::HttpAuthController* auth_controller, |
| + net::CompletionCallback callback) { |
| + // Since have not way to respond, simply invoke the callback and the |
|
akalin
2012/01/20 01:45:56
Have not way -> we have no way
Ryan Hamilton
2012/01/20 03:51:02
Done.
|
| + // request will fail. |
| + callback.Run(net::OK); |
| +} |
| + |
| +} // namespace |
| + |
| ProxyResolvingClientSocket::ProxyResolvingClientSocket( |
| net::ClientSocketFactory* socket_factory, |
| const scoped_refptr<net::URLRequestContextGetter>& request_context_getter, |
| @@ -172,7 +184,9 @@ |
| // Now that we have resolved the proxy, we need to connect. |
| status = net::InitSocketHandleForRawConnect( |
| dest_host_port_pair_, network_session_.get(), proxy_info_, ssl_config_, |
| - ssl_config_, bound_net_log_, transport_.get(), connect_callback_); |
| + ssl_config_, bound_net_log_, transport_.get(), |
| + base::Bind(&HandleProxyTunnelAuth), connect_callback_); |
| + |
| if (status != net::ERR_IO_PENDING) { |
| // Since this method is always called asynchronously. it is OK to call |
| // ProcessConnectDone synchronously. |
| @@ -180,6 +194,7 @@ |
| } |
| } |
| + |
| void ProxyResolvingClientSocket::ProcessConnectDone(int status) { |
|
akalin
2012/01/20 01:45:56
Remove extra space
Ryan Hamilton
2012/01/20 03:51:02
Done.
|
| if (status != net::OK) { |
| // If the connection fails, try another proxy. |