| 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 DnsRRResolver* dnsrr_resolver, | 23 DnsRRResolver* dnsrr_resolver, |
| 24 SSLHostInfoFactory* ssl_host_info_factory, | |
| 25 ProxyService* proxy_service, | 24 ProxyService* proxy_service, |
| 26 ClientSocketFactory* client_socket_factory, | 25 ClientSocketFactory* client_socket_factory, |
| 27 SSLConfigService* ssl_config_service, | 26 SSLConfigService* ssl_config_service, |
| 28 SpdySessionPool* spdy_session_pool, | 27 SpdySessionPool* spdy_session_pool, |
| 29 HttpAuthHandlerFactory* http_auth_handler_factory, | 28 HttpAuthHandlerFactory* http_auth_handler_factory, |
| 30 HttpNetworkDelegate* network_delegate, | 29 HttpNetworkDelegate* network_delegate, |
| 31 NetLog* net_log) | 30 NetLog* net_log) |
| 32 : socket_factory_(client_socket_factory), | 31 : socket_factory_(client_socket_factory), |
| 33 host_resolver_(host_resolver), | 32 host_resolver_(host_resolver), |
| 34 dnsrr_resolver_(dnsrr_resolver), | 33 dnsrr_resolver_(dnsrr_resolver), |
| 35 proxy_service_(proxy_service), | 34 proxy_service_(proxy_service), |
| 36 ssl_config_service_(ssl_config_service), | 35 ssl_config_service_(ssl_config_service), |
| 37 socket_pool_manager_(net_log, | 36 socket_pool_manager_(net_log, |
| 38 client_socket_factory, | 37 client_socket_factory, |
| 39 host_resolver, | 38 host_resolver, |
| 40 dnsrr_resolver, | 39 dnsrr_resolver, |
| 41 ssl_host_info_factory, | |
| 42 proxy_service, | 40 proxy_service, |
| 43 ssl_config_service), | 41 ssl_config_service), |
| 44 spdy_session_pool_(spdy_session_pool), | 42 spdy_session_pool_(spdy_session_pool), |
| 45 http_auth_handler_factory_(http_auth_handler_factory), | 43 http_auth_handler_factory_(http_auth_handler_factory), |
| 46 network_delegate_(network_delegate), | 44 network_delegate_(network_delegate), |
| 47 net_log_(net_log) { | 45 net_log_(net_log) { |
| 48 DCHECK(proxy_service); | 46 DCHECK(proxy_service); |
| 49 DCHECK(ssl_config_service); | 47 DCHECK(ssl_config_service); |
| 50 } | 48 } |
| 51 | 49 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 63 HttpResponseBodyDrainer* drainer) { | 61 HttpResponseBodyDrainer* drainer) { |
| 64 DCHECK(ContainsKey(response_drainers_, drainer)); | 62 DCHECK(ContainsKey(response_drainers_, drainer)); |
| 65 response_drainers_.erase(drainer); | 63 response_drainers_.erase(drainer); |
| 66 } | 64 } |
| 67 | 65 |
| 68 Value* HttpNetworkSession::SpdySessionPoolInfoToValue() const { | 66 Value* HttpNetworkSession::SpdySessionPoolInfoToValue() const { |
| 69 return spdy_session_pool_->SpdySessionPoolInfoToValue(); | 67 return spdy_session_pool_->SpdySessionPoolInfoToValue(); |
| 70 } | 68 } |
| 71 | 69 |
| 72 } // namespace net | 70 } // namespace net |
| OLD | NEW |