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

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

Issue 1811283004: Remove NetworkDelegate from HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Response to comments Created 4 years, 9 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
« no previous file with comments | « jingle/glue/proxy_resolving_client_socket.cc ('k') | net/http/http_network_session.cc » ('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) 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 #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 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 27 matching lines...) Expand all
38 class ClientSocketFactory; 38 class ClientSocketFactory;
39 class ClientSocketPoolManager; 39 class ClientSocketPoolManager;
40 class CTVerifier; 40 class CTVerifier;
41 class HostResolver; 41 class HostResolver;
42 class HttpAuthHandlerFactory; 42 class HttpAuthHandlerFactory;
43 class HttpNetworkSessionPeer; 43 class HttpNetworkSessionPeer;
44 class HttpProxyClientSocketPool; 44 class HttpProxyClientSocketPool;
45 class HttpResponseBodyDrainer; 45 class HttpResponseBodyDrainer;
46 class HttpServerProperties; 46 class HttpServerProperties;
47 class NetLog; 47 class NetLog;
48 class NetworkDelegate;
49 class ProxyDelegate; 48 class ProxyDelegate;
50 class ProxyService; 49 class ProxyService;
51 class QuicClock; 50 class QuicClock;
52 class QuicCryptoClientStreamFactory; 51 class QuicCryptoClientStreamFactory;
53 class QuicServerInfoFactory; 52 class QuicServerInfoFactory;
54 class SocketPerformanceWatcherFactory; 53 class SocketPerformanceWatcherFactory;
55 class SOCKSClientSocketPool; 54 class SOCKSClientSocketPool;
56 class SSLClientSocketPool; 55 class SSLClientSocketPool;
57 class SSLConfigService; 56 class SSLConfigService;
58 class TransportClientSocketPool; 57 class TransportClientSocketPool;
(...skipping 11 matching lines...) Expand all
70 ClientSocketFactory* client_socket_factory; 69 ClientSocketFactory* client_socket_factory;
71 HostResolver* host_resolver; 70 HostResolver* host_resolver;
72 CertVerifier* cert_verifier; 71 CertVerifier* cert_verifier;
73 CTPolicyEnforcer* ct_policy_enforcer; 72 CTPolicyEnforcer* ct_policy_enforcer;
74 ChannelIDService* channel_id_service; 73 ChannelIDService* channel_id_service;
75 TransportSecurityState* transport_security_state; 74 TransportSecurityState* transport_security_state;
76 CTVerifier* cert_transparency_verifier; 75 CTVerifier* cert_transparency_verifier;
77 ProxyService* proxy_service; 76 ProxyService* proxy_service;
78 SSLConfigService* ssl_config_service; 77 SSLConfigService* ssl_config_service;
79 HttpAuthHandlerFactory* http_auth_handler_factory; 78 HttpAuthHandlerFactory* http_auth_handler_factory;
80 NetworkDelegate* network_delegate;
81 base::WeakPtr<HttpServerProperties> http_server_properties; 79 base::WeakPtr<HttpServerProperties> http_server_properties;
82 NetLog* net_log; 80 NetLog* net_log;
83 HostMappingRules* host_mapping_rules; 81 HostMappingRules* host_mapping_rules;
84 SocketPerformanceWatcherFactory* socket_performance_watcher_factory; 82 SocketPerformanceWatcherFactory* socket_performance_watcher_factory;
85 bool ignore_certificate_errors; 83 bool ignore_certificate_errors;
86 uint16_t testing_fixed_http_port; 84 uint16_t testing_fixed_http_port;
87 uint16_t testing_fixed_https_port; 85 uint16_t testing_fixed_https_port;
88 bool enable_tcp_fast_open_for_ssl; 86 bool enable_tcp_fast_open_for_ssl;
89 87
90 // Use SPDY ping frames to test for connection health after idle. 88 // Use SPDY ping frames to test for connection health after idle.
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 const HostPortPair& proxy_server); 219 const HostPortPair& proxy_server);
222 220
223 CertVerifier* cert_verifier() { return cert_verifier_; } 221 CertVerifier* cert_verifier() { return cert_verifier_; }
224 ProxyService* proxy_service() { return proxy_service_; } 222 ProxyService* proxy_service() { return proxy_service_; }
225 SSLConfigService* ssl_config_service() { return ssl_config_service_.get(); } 223 SSLConfigService* ssl_config_service() { return ssl_config_service_.get(); }
226 SpdySessionPool* spdy_session_pool() { return &spdy_session_pool_; } 224 SpdySessionPool* spdy_session_pool() { return &spdy_session_pool_; }
227 QuicStreamFactory* quic_stream_factory() { return &quic_stream_factory_; } 225 QuicStreamFactory* quic_stream_factory() { return &quic_stream_factory_; }
228 HttpAuthHandlerFactory* http_auth_handler_factory() { 226 HttpAuthHandlerFactory* http_auth_handler_factory() {
229 return http_auth_handler_factory_; 227 return http_auth_handler_factory_;
230 } 228 }
231 NetworkDelegate* network_delegate() {
232 return network_delegate_;
233 }
234 base::WeakPtr<HttpServerProperties> http_server_properties() { 229 base::WeakPtr<HttpServerProperties> http_server_properties() {
235 return http_server_properties_; 230 return http_server_properties_;
236 } 231 }
237 HttpStreamFactory* http_stream_factory() { 232 HttpStreamFactory* http_stream_factory() {
238 return http_stream_factory_.get(); 233 return http_stream_factory_.get();
239 } 234 }
240 HttpStreamFactory* http_stream_factory_for_websocket() { 235 HttpStreamFactory* http_stream_factory_for_websocket() {
241 return http_stream_factory_for_websocket_.get(); 236 return http_stream_factory_for_websocket_.get();
242 } 237 }
243 NetLog* net_log() { 238 NetLog* net_log() {
(...skipping 23 matching lines...) Expand all
267 262
268 // Populates |*npn_protos| with protocols to be used with NPN. 263 // Populates |*npn_protos| with protocols to be used with NPN.
269 void GetNpnProtos(NextProtoVector* npn_protos) const; 264 void GetNpnProtos(NextProtoVector* npn_protos) const;
270 265
271 private: 266 private:
272 friend class HttpNetworkSessionPeer; 267 friend class HttpNetworkSessionPeer;
273 268
274 ClientSocketPoolManager* GetSocketPoolManager(SocketPoolType pool_type); 269 ClientSocketPoolManager* GetSocketPoolManager(SocketPoolType pool_type);
275 270
276 NetLog* const net_log_; 271 NetLog* const net_log_;
277 NetworkDelegate* const network_delegate_;
278 const base::WeakPtr<HttpServerProperties> http_server_properties_; 272 const base::WeakPtr<HttpServerProperties> http_server_properties_;
279 CertVerifier* const cert_verifier_; 273 CertVerifier* const cert_verifier_;
280 HttpAuthHandlerFactory* const http_auth_handler_factory_; 274 HttpAuthHandlerFactory* const http_auth_handler_factory_;
281 275
282 // Not const since it's modified by HttpNetworkSessionPeer for testing. 276 // Not const since it's modified by HttpNetworkSessionPeer for testing.
283 ProxyService* proxy_service_; 277 ProxyService* proxy_service_;
284 const scoped_refptr<SSLConfigService> ssl_config_service_; 278 const scoped_refptr<SSLConfigService> ssl_config_service_;
285 279
286 HttpAuthCache http_auth_cache_; 280 HttpAuthCache http_auth_cache_;
287 SSLClientAuthCache ssl_client_auth_cache_; 281 SSLClientAuthCache ssl_client_auth_cache_;
288 scoped_ptr<ClientSocketPoolManager> normal_socket_pool_manager_; 282 scoped_ptr<ClientSocketPoolManager> normal_socket_pool_manager_;
289 scoped_ptr<ClientSocketPoolManager> websocket_socket_pool_manager_; 283 scoped_ptr<ClientSocketPoolManager> websocket_socket_pool_manager_;
290 QuicStreamFactory quic_stream_factory_; 284 QuicStreamFactory quic_stream_factory_;
291 SpdySessionPool spdy_session_pool_; 285 SpdySessionPool spdy_session_pool_;
292 scoped_ptr<HttpStreamFactory> http_stream_factory_; 286 scoped_ptr<HttpStreamFactory> http_stream_factory_;
293 scoped_ptr<HttpStreamFactory> http_stream_factory_for_websocket_; 287 scoped_ptr<HttpStreamFactory> http_stream_factory_for_websocket_;
294 std::set<HttpResponseBodyDrainer*> response_drainers_; 288 std::set<HttpResponseBodyDrainer*> response_drainers_;
295 289
296 NextProtoVector next_protos_; 290 NextProtoVector next_protos_;
297 bool enabled_protocols_[NUM_VALID_ALTERNATE_PROTOCOLS]; 291 bool enabled_protocols_[NUM_VALID_ALTERNATE_PROTOCOLS];
298 292
299 Params params_; 293 Params params_;
300 }; 294 };
301 295
302 } // namespace net 296 } // namespace net
303 297
304 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_ 298 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_
OLDNEW
« no previous file with comments | « jingle/glue/proxy_resolving_client_socket.cc ('k') | net/http/http_network_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698