OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/socket/client_socket_pool_manager.h" | 5 #include "net/socket/client_socket_pool_manager.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 | 190 |
191 http_proxy_params = | 191 http_proxy_params = |
192 new HttpProxySocketParams(proxy_tcp_params, | 192 new HttpProxySocketParams(proxy_tcp_params, |
193 ssl_params, | 193 ssl_params, |
194 request_url, | 194 request_url, |
195 user_agent, | 195 user_agent, |
196 origin_host_port, | 196 origin_host_port, |
197 session->http_auth_cache(), | 197 session->http_auth_cache(), |
198 session->http_auth_handler_factory(), | 198 session->http_auth_handler_factory(), |
199 session->spdy_session_pool(), | 199 session->spdy_session_pool(), |
200 force_tunnel || using_ssl); | 200 force_tunnel || using_ssl, |
| 201 session->params().proxy_delegate); |
201 } else { | 202 } else { |
202 DCHECK(proxy_info.is_socks()); | 203 DCHECK(proxy_info.is_socks()); |
203 char socks_version; | 204 char socks_version; |
204 if (proxy_server.scheme() == ProxyServer::SCHEME_SOCKS5) | 205 if (proxy_server.scheme() == ProxyServer::SCHEME_SOCKS5) |
205 socks_version = '5'; | 206 socks_version = '5'; |
206 else | 207 else |
207 socks_version = '4'; | 208 socks_version = '4'; |
208 connection_group = base::StringPrintf( | 209 connection_group = base::StringPrintf( |
209 "socks%c/%s", socks_version, connection_group.c_str()); | 210 "socks%c/%s", socks_version, connection_group.c_str()); |
210 | 211 |
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
477 int num_preconnect_streams) { | 478 int num_preconnect_streams) { |
478 return InitSocketPoolHelper( | 479 return InitSocketPoolHelper( |
479 request_url, request_extra_headers, request_load_flags, request_priority, | 480 request_url, request_extra_headers, request_load_flags, request_priority, |
480 session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn, | 481 session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn, |
481 ssl_config_for_origin, ssl_config_for_proxy, false, privacy_mode, net_log, | 482 ssl_config_for_origin, ssl_config_for_proxy, false, privacy_mode, net_log, |
482 num_preconnect_streams, NULL, HttpNetworkSession::NORMAL_SOCKET_POOL, | 483 num_preconnect_streams, NULL, HttpNetworkSession::NORMAL_SOCKET_POOL, |
483 OnHostResolutionCallback(), CompletionCallback()); | 484 OnHostResolutionCallback(), CompletionCallback()); |
484 } | 485 } |
485 | 486 |
486 } // namespace net | 487 } // namespace net |
OLD | NEW |