| 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 PRIVACY_MODE_DISABLED, | 195 PRIVACY_MODE_DISABLED, |
| 196 load_flags, | 196 load_flags, |
| 197 force_spdy_over_ssl, | 197 force_spdy_over_ssl, |
| 198 want_spdy_over_npn); | 198 want_spdy_over_npn); |
| 199 proxy_tcp_params = NULL; | 199 proxy_tcp_params = NULL; |
| 200 } | 200 } |
| 201 | 201 |
| 202 http_proxy_params = | 202 http_proxy_params = |
| 203 new HttpProxySocketParams(proxy_tcp_params, | 203 new HttpProxySocketParams(proxy_tcp_params, |
| 204 ssl_params, | 204 ssl_params, |
| 205 request_url, | |
| 206 user_agent, | 205 user_agent, |
| 207 origin_host_port, | 206 origin_host_port, |
| 208 session->http_auth_cache(), | 207 session->http_auth_cache(), |
| 209 session->http_auth_handler_factory(), | 208 session->http_auth_handler_factory(), |
| 210 session->spdy_session_pool(), | 209 session->spdy_session_pool(), |
| 211 force_tunnel || using_ssl, | 210 force_tunnel || using_ssl, |
| 212 session->params().proxy_delegate); | 211 session->params().proxy_delegate); |
| 213 } else { | 212 } else { |
| 214 DCHECK(proxy_info.is_socks()); | 213 DCHECK(proxy_info.is_socks()); |
| 215 char socks_version; | 214 char socks_version; |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 510 int num_preconnect_streams) { | 509 int num_preconnect_streams) { |
| 511 return InitSocketPoolHelper( | 510 return InitSocketPoolHelper( |
| 512 request_url, request_extra_headers, request_load_flags, request_priority, | 511 request_url, request_extra_headers, request_load_flags, request_priority, |
| 513 session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn, | 512 session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn, |
| 514 ssl_config_for_origin, ssl_config_for_proxy, false, privacy_mode, net_log, | 513 ssl_config_for_origin, ssl_config_for_proxy, false, privacy_mode, net_log, |
| 515 num_preconnect_streams, NULL, HttpNetworkSession::NORMAL_SOCKET_POOL, | 514 num_preconnect_streams, NULL, HttpNetworkSession::NORMAL_SOCKET_POOL, |
| 516 OnHostResolutionCallback(), CompletionCallback()); | 515 OnHostResolutionCallback(), CompletionCallback()); |
| 517 } | 516 } |
| 518 | 517 |
| 519 } // namespace net | 518 } // namespace net |
| OLD | NEW |