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

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

Issue 3533013: net: plumb DnsRRResolver from IOThread to HttpNetworkSession. (Closed)
Patch Set: Created 10 years, 2 months 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
OLDNEW
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 #ifndef NET_HTTP_HTTP_NETWORK_SESSION_H_ 5 #ifndef NET_HTTP_HTTP_NETWORK_SESSION_H_
6 #define NET_HTTP_HTTP_NETWORK_SESSION_H_ 6 #define NET_HTTP_HTTP_NETWORK_SESSION_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 11 matching lines...) Expand all
22 #include "net/http/http_stream_factory.h" 22 #include "net/http/http_stream_factory.h"
23 #include "net/proxy/proxy_service.h" 23 #include "net/proxy/proxy_service.h"
24 #include "net/socket/client_socket_pool_manager.h" 24 #include "net/socket/client_socket_pool_manager.h"
25 #include "net/spdy/spdy_settings_storage.h" 25 #include "net/spdy/spdy_settings_storage.h"
26 26
27 class Value; 27 class Value;
28 28
29 namespace net { 29 namespace net {
30 30
31 class ClientSocketFactory; 31 class ClientSocketFactory;
32 class DnsRRResolver;
32 class HttpAuthHandlerFactory; 33 class HttpAuthHandlerFactory;
33 class HttpNetworkDelegate; 34 class HttpNetworkDelegate;
34 class HttpNetworkSessionPeer; 35 class HttpNetworkSessionPeer;
35 class HttpProxyClientSocketPool; 36 class HttpProxyClientSocketPool;
36 class HttpResponseBodyDrainer; 37 class HttpResponseBodyDrainer;
37 class SpdySessionPool; 38 class SpdySessionPool;
38 class SOCKSClientSocketPool; 39 class SOCKSClientSocketPool;
39 class SSLClientSocketPool; 40 class SSLClientSocketPool;
40 class TCPClientSocketPool; 41 class TCPClientSocketPool;
41 42
42 // This class holds session objects used by HttpNetworkTransaction objects. 43 // This class holds session objects used by HttpNetworkTransaction objects.
43 class HttpNetworkSession : public base::RefCounted<HttpNetworkSession>, 44 class HttpNetworkSession : public base::RefCounted<HttpNetworkSession>,
44 public NonThreadSafe { 45 public NonThreadSafe {
45 public: 46 public:
46 HttpNetworkSession( 47 HttpNetworkSession(
47 HostResolver* host_resolver, 48 HostResolver* host_resolver,
49 DnsRRResolver* dnsrr_resolver,
48 ProxyService* proxy_service, 50 ProxyService* proxy_service,
49 ClientSocketFactory* client_socket_factory, 51 ClientSocketFactory* client_socket_factory,
50 SSLConfigService* ssl_config_service, 52 SSLConfigService* ssl_config_service,
51 SpdySessionPool* spdy_session_pool, 53 SpdySessionPool* spdy_session_pool,
52 HttpAuthHandlerFactory* http_auth_handler_factory, 54 HttpAuthHandlerFactory* http_auth_handler_factory,
53 HttpNetworkDelegate* network_delegate, 55 HttpNetworkDelegate* network_delegate,
54 NetLog* net_log); 56 NetLog* net_log);
55 57
56 HttpAuthCache* auth_cache() { return &auth_cache_; } 58 HttpAuthCache* auth_cache() { return &auth_cache_; }
57 SSLClientAuthCache* ssl_client_auth_cache() { 59 SSLClientAuthCache* ssl_client_auth_cache() {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 } 98 }
97 99
98 SSLClientSocketPool* GetSocketPoolForSSLWithProxy( 100 SSLClientSocketPool* GetSocketPoolForSSLWithProxy(
99 const HostPortPair& proxy_server) { 101 const HostPortPair& proxy_server) {
100 return socket_pool_manager_.GetSocketPoolForSSLWithProxy(proxy_server); 102 return socket_pool_manager_.GetSocketPoolForSSLWithProxy(proxy_server);
101 } 103 }
102 104
103 // SSL sockets come from the socket_factory(). 105 // SSL sockets come from the socket_factory().
104 ClientSocketFactory* socket_factory() { return socket_factory_; } 106 ClientSocketFactory* socket_factory() { return socket_factory_; }
105 HostResolver* host_resolver() { return host_resolver_; } 107 HostResolver* host_resolver() { return host_resolver_; }
108 DnsRRResolver* dnsrr_resolver() { return dnsrr_resolver_; }
106 ProxyService* proxy_service() { return proxy_service_; } 109 ProxyService* proxy_service() { return proxy_service_; }
107 SSLConfigService* ssl_config_service() { return ssl_config_service_; } 110 SSLConfigService* ssl_config_service() { return ssl_config_service_; }
108 SpdySessionPool* spdy_session_pool() { return spdy_session_pool_.get(); } 111 SpdySessionPool* spdy_session_pool() { return spdy_session_pool_.get(); }
109 HttpAuthHandlerFactory* http_auth_handler_factory() { 112 HttpAuthHandlerFactory* http_auth_handler_factory() {
110 return http_auth_handler_factory_; 113 return http_auth_handler_factory_;
111 } 114 }
112 HttpNetworkDelegate* network_delegate() { 115 HttpNetworkDelegate* network_delegate() {
113 return network_delegate_; 116 return network_delegate_;
114 } 117 }
115 118
(...skipping 15 matching lines...) Expand all
131 friend class base::RefCounted<HttpNetworkSession>; 134 friend class base::RefCounted<HttpNetworkSession>;
132 friend class HttpNetworkSessionPeer; 135 friend class HttpNetworkSessionPeer;
133 136
134 ~HttpNetworkSession(); 137 ~HttpNetworkSession();
135 138
136 ClientSocketFactory* const socket_factory_; 139 ClientSocketFactory* const socket_factory_;
137 HttpAuthCache auth_cache_; 140 HttpAuthCache auth_cache_;
138 SSLClientAuthCache ssl_client_auth_cache_; 141 SSLClientAuthCache ssl_client_auth_cache_;
139 HttpAlternateProtocols alternate_protocols_; 142 HttpAlternateProtocols alternate_protocols_;
140 HostResolver* const host_resolver_; 143 HostResolver* const host_resolver_;
144 DnsRRResolver* dnsrr_resolver_;
141 scoped_refptr<ProxyService> proxy_service_; 145 scoped_refptr<ProxyService> proxy_service_;
142 scoped_refptr<SSLConfigService> ssl_config_service_; 146 scoped_refptr<SSLConfigService> ssl_config_service_;
143 ClientSocketPoolManager socket_pool_manager_; 147 ClientSocketPoolManager socket_pool_manager_;
144 // TODO(willchan): Move this out to IOThread so it can be shared across 148 // TODO(willchan): Move this out to IOThread so it can be shared across
145 // URLRequestContexts. 149 // URLRequestContexts.
146 scoped_ptr<SpdySessionPool> spdy_session_pool_; 150 scoped_ptr<SpdySessionPool> spdy_session_pool_;
147 scoped_refptr<HttpStreamFactory> http_stream_factory_; 151 scoped_refptr<HttpStreamFactory> http_stream_factory_;
148 HttpAuthHandlerFactory* http_auth_handler_factory_; 152 HttpAuthHandlerFactory* http_auth_handler_factory_;
149 HttpNetworkDelegate* const network_delegate_; 153 HttpNetworkDelegate* const network_delegate_;
150 NetLog* net_log_; 154 NetLog* net_log_;
151 SpdySettingsStorage spdy_settings_; 155 SpdySettingsStorage spdy_settings_;
152 std::set<HttpResponseBodyDrainer*> response_drainers_; 156 std::set<HttpResponseBodyDrainer*> response_drainers_;
153 }; 157 };
154 158
155 } // namespace net 159 } // namespace net
156 160
157 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_ 161 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698