Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(330)

Side by Side Diff: net/http/http_network_session.cc

Issue 8572041: Make ClientSocketPoolManager into an interface. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix some straggler renames. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/http/http_network_session.h ('k') | net/http/http_network_session_peer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "net/http/http_auth_handler_factory.h" 14 #include "net/http/http_auth_handler_factory.h"
15 #include "net/http/http_response_body_drainer.h" 15 #include "net/http/http_response_body_drainer.h"
16 #include "net/http/http_stream_factory_impl.h" 16 #include "net/http/http_stream_factory_impl.h"
17 #include "net/http/url_security_manager.h" 17 #include "net/http/url_security_manager.h"
18 #include "net/proxy/proxy_service.h" 18 #include "net/proxy/proxy_service.h"
19 #include "net/socket/client_socket_factory.h" 19 #include "net/socket/client_socket_factory.h"
20 #include "net/socket/client_socket_pool_manager_impl.h"
20 #include "net/spdy/spdy_session_pool.h" 21 #include "net/spdy/spdy_session_pool.h"
21 22
22 namespace net { 23 namespace net {
23 24
24 // TODO(mbelshe): Move the socket factories into HttpStreamFactory. 25 // TODO(mbelshe): Move the socket factories into HttpStreamFactory.
25 HttpNetworkSession::HttpNetworkSession(const Params& params) 26 HttpNetworkSession::HttpNetworkSession(const Params& params)
26 : net_log_(params.net_log), 27 : net_log_(params.net_log),
27 network_delegate_(params.network_delegate), 28 network_delegate_(params.network_delegate),
28 http_server_properties_(params.http_server_properties), 29 http_server_properties_(params.http_server_properties),
29 cert_verifier_(params.cert_verifier), 30 cert_verifier_(params.cert_verifier),
30 http_auth_handler_factory_(params.http_auth_handler_factory), 31 http_auth_handler_factory_(params.http_auth_handler_factory),
31 proxy_service_(params.proxy_service), 32 proxy_service_(params.proxy_service),
32 ssl_config_service_(params.ssl_config_service), 33 ssl_config_service_(params.ssl_config_service),
33 socket_pool_manager_(params.net_log, 34 socket_pool_manager_(
34 params.client_socket_factory ? 35 new ClientSocketPoolManagerImpl(
35 params.client_socket_factory : 36 params.net_log,
36 ClientSocketFactory::GetDefaultFactory(), 37 params.client_socket_factory ?
37 params.host_resolver, 38 params.client_socket_factory :
38 params.cert_verifier, 39 ClientSocketFactory::GetDefaultFactory(),
39 params.origin_bound_cert_service, 40 params.host_resolver,
40 params.dnsrr_resolver, 41 params.cert_verifier,
41 params.dns_cert_checker, 42 params.origin_bound_cert_service,
42 params.ssl_host_info_factory, 43 params.dnsrr_resolver,
43 params.proxy_service, 44 params.dns_cert_checker,
44 params.ssl_config_service), 45 params.ssl_host_info_factory,
46 params.proxy_service,
47 params.ssl_config_service)),
45 spdy_session_pool_(params.host_resolver, 48 spdy_session_pool_(params.host_resolver,
46 params.ssl_config_service, 49 params.ssl_config_service,
47 params.http_server_properties), 50 params.http_server_properties),
48 ALLOW_THIS_IN_INITIALIZER_LIST(http_stream_factory_( 51 ALLOW_THIS_IN_INITIALIZER_LIST(http_stream_factory_(
49 new HttpStreamFactoryImpl(this))) { 52 new HttpStreamFactoryImpl(this))) {
50 DCHECK(proxy_service_); 53 DCHECK(proxy_service_);
51 DCHECK(ssl_config_service_); 54 DCHECK(ssl_config_service_);
52 CHECK(http_server_properties_); 55 CHECK(http_server_properties_);
53 } 56 }
54 57
55 HttpNetworkSession::~HttpNetworkSession() { 58 HttpNetworkSession::~HttpNetworkSession() {
56 STLDeleteElements(&response_drainers_); 59 STLDeleteElements(&response_drainers_);
57 spdy_session_pool_.CloseAllSessions(); 60 spdy_session_pool_.CloseAllSessions();
58 } 61 }
59 62
60 void HttpNetworkSession::AddResponseDrainer(HttpResponseBodyDrainer* drainer) { 63 void HttpNetworkSession::AddResponseDrainer(HttpResponseBodyDrainer* drainer) {
61 DCHECK(!ContainsKey(response_drainers_, drainer)); 64 DCHECK(!ContainsKey(response_drainers_, drainer));
62 response_drainers_.insert(drainer); 65 response_drainers_.insert(drainer);
63 } 66 }
64 67
65 void HttpNetworkSession::RemoveResponseDrainer( 68 void HttpNetworkSession::RemoveResponseDrainer(
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 SOCKSClientSocketPool* HttpNetworkSession::GetSocketPoolForSOCKSProxy( 74 SOCKSClientSocketPool* HttpNetworkSession::GetSocketPoolForSOCKSProxy(
72 const HostPortPair& socks_proxy) { 75 const HostPortPair& socks_proxy) {
73 return socket_pool_manager_.GetSocketPoolForSOCKSProxy(socks_proxy); 76 return socket_pool_manager_->GetSocketPoolForSOCKSProxy(socks_proxy);
74 } 77 }
75 78
76 HttpProxyClientSocketPool* HttpNetworkSession::GetSocketPoolForHTTPProxy( 79 HttpProxyClientSocketPool* HttpNetworkSession::GetSocketPoolForHTTPProxy(
77 const HostPortPair& http_proxy) { 80 const HostPortPair& http_proxy) {
78 return socket_pool_manager_.GetSocketPoolForHTTPProxy(http_proxy); 81 return socket_pool_manager_->GetSocketPoolForHTTPProxy(http_proxy);
79 } 82 }
80 83
81 SSLClientSocketPool* HttpNetworkSession::GetSocketPoolForSSLWithProxy( 84 SSLClientSocketPool* HttpNetworkSession::GetSocketPoolForSSLWithProxy(
82 const HostPortPair& proxy_server) { 85 const HostPortPair& proxy_server) {
83 return socket_pool_manager_.GetSocketPoolForSSLWithProxy(proxy_server); 86 return socket_pool_manager_->GetSocketPoolForSSLWithProxy(proxy_server);
84 } 87 }
85 88
86 Value* HttpNetworkSession::SocketPoolInfoToValue() const { 89 Value* HttpNetworkSession::SocketPoolInfoToValue() const {
87 return socket_pool_manager_.SocketPoolInfoToValue(); 90 return socket_pool_manager_->SocketPoolInfoToValue();
88 } 91 }
89 92
90 Value* HttpNetworkSession::SpdySessionPoolInfoToValue() const { 93 Value* HttpNetworkSession::SpdySessionPoolInfoToValue() const {
91 return spdy_session_pool_.SpdySessionPoolInfoToValue(); 94 return spdy_session_pool_.SpdySessionPoolInfoToValue();
92 } 95 }
93 96
94 void HttpNetworkSession::CloseAllConnections() { 97 void HttpNetworkSession::CloseAllConnections() {
95 socket_pool_manager_.FlushSocketPools(); 98 socket_pool_manager_->FlushSocketPools();
96 spdy_session_pool_.CloseCurrentSessions(); 99 spdy_session_pool_.CloseCurrentSessions();
97 } 100 }
98 101
99 void HttpNetworkSession::CloseIdleConnections() { 102 void HttpNetworkSession::CloseIdleConnections() {
100 socket_pool_manager_.CloseIdleSockets(); 103 socket_pool_manager_->CloseIdleSockets();
101 spdy_session_pool_.CloseIdleSessions(); 104 spdy_session_pool_.CloseIdleSessions();
102 } 105 }
103 106
104 } // namespace net 107 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_session.h ('k') | net/http/http_network_session_peer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698