| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/http/http_network_session.h" | 5 #include "net/http/http_network_session.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/stl_util-inl.h" | 10 #include "base/stl_util-inl.h" |
| 11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 12 #include "base/values.h" | 12 #include "base/values.h" |
| 13 #include "net/http/http_auth_handler_factory.h" | 13 #include "net/http/http_auth_handler_factory.h" |
| 14 #include "net/http/http_response_body_drainer.h" | 14 #include "net/http/http_response_body_drainer.h" |
| 15 #include "net/http/url_security_manager.h" | 15 #include "net/http/url_security_manager.h" |
| 16 #include "net/spdy/spdy_session_pool.h" | 16 #include "net/spdy/spdy_session_pool.h" |
| 17 | 17 |
| 18 namespace net { | 18 namespace net { |
| 19 | 19 |
| 20 // TODO(mbelshe): Move the socket factories into HttpStreamFactory. | 20 // TODO(mbelshe): Move the socket factories into HttpStreamFactory. |
| 21 HttpNetworkSession::HttpNetworkSession( | 21 HttpNetworkSession::HttpNetworkSession( |
| 22 HostResolver* host_resolver, | 22 HostResolver* host_resolver, |
| 23 CertVerifier* cert_verifier, |
| 23 DnsRRResolver* dnsrr_resolver, | 24 DnsRRResolver* dnsrr_resolver, |
| 24 DnsCertProvenanceChecker* dns_cert_checker, | 25 DnsCertProvenanceChecker* dns_cert_checker, |
| 25 SSLHostInfoFactory* ssl_host_info_factory, | 26 SSLHostInfoFactory* ssl_host_info_factory, |
| 26 ProxyService* proxy_service, | 27 ProxyService* proxy_service, |
| 27 ClientSocketFactory* client_socket_factory, | 28 ClientSocketFactory* client_socket_factory, |
| 28 SSLConfigService* ssl_config_service, | 29 SSLConfigService* ssl_config_service, |
| 29 SpdySessionPool* spdy_session_pool, | 30 SpdySessionPool* spdy_session_pool, |
| 30 HttpAuthHandlerFactory* http_auth_handler_factory, | 31 HttpAuthHandlerFactory* http_auth_handler_factory, |
| 31 HttpNetworkDelegate* network_delegate, | 32 HttpNetworkDelegate* network_delegate, |
| 32 NetLog* net_log) | 33 NetLog* net_log) |
| 33 : socket_factory_(client_socket_factory), | 34 : socket_factory_(client_socket_factory), |
| 34 host_resolver_(host_resolver), | 35 host_resolver_(host_resolver), |
| 36 cert_verifier_(cert_verifier), |
| 35 dnsrr_resolver_(dnsrr_resolver), | 37 dnsrr_resolver_(dnsrr_resolver), |
| 36 dns_cert_checker_(dns_cert_checker), | 38 dns_cert_checker_(dns_cert_checker), |
| 37 proxy_service_(proxy_service), | 39 proxy_service_(proxy_service), |
| 38 ssl_config_service_(ssl_config_service), | 40 ssl_config_service_(ssl_config_service), |
| 39 socket_pool_manager_(net_log, | 41 socket_pool_manager_(net_log, |
| 40 client_socket_factory, | 42 client_socket_factory, |
| 41 host_resolver, | 43 host_resolver, |
| 44 cert_verifier, |
| 42 dnsrr_resolver, | 45 dnsrr_resolver, |
| 43 dns_cert_checker, | 46 dns_cert_checker, |
| 44 ssl_host_info_factory, | 47 ssl_host_info_factory, |
| 45 proxy_service, | 48 proxy_service, |
| 46 ssl_config_service), | 49 ssl_config_service), |
| 47 spdy_session_pool_(spdy_session_pool), | 50 spdy_session_pool_(spdy_session_pool), |
| 48 http_auth_handler_factory_(http_auth_handler_factory), | 51 http_auth_handler_factory_(http_auth_handler_factory), |
| 49 network_delegate_(network_delegate), | 52 network_delegate_(network_delegate), |
| 50 net_log_(net_log) { | 53 net_log_(net_log) { |
| 51 DCHECK(proxy_service); | 54 DCHECK(proxy_service); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 66 HttpResponseBodyDrainer* drainer) { | 69 HttpResponseBodyDrainer* drainer) { |
| 67 DCHECK(ContainsKey(response_drainers_, drainer)); | 70 DCHECK(ContainsKey(response_drainers_, drainer)); |
| 68 response_drainers_.erase(drainer); | 71 response_drainers_.erase(drainer); |
| 69 } | 72 } |
| 70 | 73 |
| 71 Value* HttpNetworkSession::SpdySessionPoolInfoToValue() const { | 74 Value* HttpNetworkSession::SpdySessionPoolInfoToValue() const { |
| 72 return spdy_session_pool_->SpdySessionPoolInfoToValue(); | 75 return spdy_session_pool_->SpdySessionPoolInfoToValue(); |
| 73 } | 76 } |
| 74 | 77 |
| 75 } // namespace net | 78 } // namespace net |
| OLD | NEW |