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

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

Issue 2041863002: Remove HttpServerProperies::GetWeakPtr(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 6 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) 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 ClientSocketFactory* client_socket_factory; 69 ClientSocketFactory* client_socket_factory;
70 HostResolver* host_resolver; 70 HostResolver* host_resolver;
71 CertVerifier* cert_verifier; 71 CertVerifier* cert_verifier;
72 CTPolicyEnforcer* ct_policy_enforcer; 72 CTPolicyEnforcer* ct_policy_enforcer;
73 ChannelIDService* channel_id_service; 73 ChannelIDService* channel_id_service;
74 TransportSecurityState* transport_security_state; 74 TransportSecurityState* transport_security_state;
75 CTVerifier* cert_transparency_verifier; 75 CTVerifier* cert_transparency_verifier;
76 ProxyService* proxy_service; 76 ProxyService* proxy_service;
77 SSLConfigService* ssl_config_service; 77 SSLConfigService* ssl_config_service;
78 HttpAuthHandlerFactory* http_auth_handler_factory; 78 HttpAuthHandlerFactory* http_auth_handler_factory;
79 base::WeakPtr<HttpServerProperties> http_server_properties; 79 HttpServerProperties* http_server_properties;
80 NetLog* net_log; 80 NetLog* net_log;
81 HostMappingRules* host_mapping_rules; 81 HostMappingRules* host_mapping_rules;
82 SocketPerformanceWatcherFactory* socket_performance_watcher_factory; 82 SocketPerformanceWatcherFactory* socket_performance_watcher_factory;
83 bool ignore_certificate_errors; 83 bool ignore_certificate_errors;
84 uint16_t testing_fixed_http_port; 84 uint16_t testing_fixed_http_port;
85 uint16_t testing_fixed_https_port; 85 uint16_t testing_fixed_https_port;
86 bool enable_tcp_fast_open_for_ssl; 86 bool enable_tcp_fast_open_for_ssl;
87 87
88 // Use SPDY ping frames to test for connection health after idle. 88 // Use SPDY ping frames to test for connection health after idle.
89 bool enable_spdy_ping_based_connection_checking; 89 bool enable_spdy_ping_based_connection_checking;
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 const HostPortPair& proxy_server); 220 const HostPortPair& proxy_server);
221 221
222 CertVerifier* cert_verifier() { return cert_verifier_; } 222 CertVerifier* cert_verifier() { return cert_verifier_; }
223 ProxyService* proxy_service() { return proxy_service_; } 223 ProxyService* proxy_service() { return proxy_service_; }
224 SSLConfigService* ssl_config_service() { return ssl_config_service_.get(); } 224 SSLConfigService* ssl_config_service() { return ssl_config_service_.get(); }
225 SpdySessionPool* spdy_session_pool() { return &spdy_session_pool_; } 225 SpdySessionPool* spdy_session_pool() { return &spdy_session_pool_; }
226 QuicStreamFactory* quic_stream_factory() { return &quic_stream_factory_; } 226 QuicStreamFactory* quic_stream_factory() { return &quic_stream_factory_; }
227 HttpAuthHandlerFactory* http_auth_handler_factory() { 227 HttpAuthHandlerFactory* http_auth_handler_factory() {
228 return http_auth_handler_factory_; 228 return http_auth_handler_factory_;
229 } 229 }
230 base::WeakPtr<HttpServerProperties> http_server_properties() { 230 HttpServerProperties* http_server_properties() {
231 return http_server_properties_; 231 return http_server_properties_;
232 } 232 }
233 HttpStreamFactory* http_stream_factory() { 233 HttpStreamFactory* http_stream_factory() {
234 return http_stream_factory_.get(); 234 return http_stream_factory_.get();
235 } 235 }
236 HttpStreamFactory* http_stream_factory_for_websocket() { 236 HttpStreamFactory* http_stream_factory_for_websocket() {
237 return http_stream_factory_for_websocket_.get(); 237 return http_stream_factory_for_websocket_.get();
238 } 238 }
239 NetLog* net_log() { 239 NetLog* net_log() {
240 return net_log_; 240 return net_log_;
(...skipping 28 matching lines...) Expand all
269 void GetSSLConfig(const HttpRequestInfo& request, 269 void GetSSLConfig(const HttpRequestInfo& request,
270 SSLConfig* server_config, 270 SSLConfig* server_config,
271 SSLConfig* proxy_config) const; 271 SSLConfig* proxy_config) const;
272 272
273 private: 273 private:
274 friend class HttpNetworkSessionPeer; 274 friend class HttpNetworkSessionPeer;
275 275
276 ClientSocketPoolManager* GetSocketPoolManager(SocketPoolType pool_type); 276 ClientSocketPoolManager* GetSocketPoolManager(SocketPoolType pool_type);
277 277
278 NetLog* const net_log_; 278 NetLog* const net_log_;
279 const base::WeakPtr<HttpServerProperties> http_server_properties_; 279 HttpServerProperties* const http_server_properties_;
280 CertVerifier* const cert_verifier_; 280 CertVerifier* const cert_verifier_;
281 HttpAuthHandlerFactory* const http_auth_handler_factory_; 281 HttpAuthHandlerFactory* const http_auth_handler_factory_;
282 282
283 // Not const since it's modified by HttpNetworkSessionPeer for testing. 283 // Not const since it's modified by HttpNetworkSessionPeer for testing.
284 ProxyService* proxy_service_; 284 ProxyService* proxy_service_;
285 const scoped_refptr<SSLConfigService> ssl_config_service_; 285 const scoped_refptr<SSLConfigService> ssl_config_service_;
286 286
287 HttpAuthCache http_auth_cache_; 287 HttpAuthCache http_auth_cache_;
288 SSLClientAuthCache ssl_client_auth_cache_; 288 SSLClientAuthCache ssl_client_auth_cache_;
289 std::unique_ptr<ClientSocketPoolManager> normal_socket_pool_manager_; 289 std::unique_ptr<ClientSocketPoolManager> normal_socket_pool_manager_;
290 std::unique_ptr<ClientSocketPoolManager> websocket_socket_pool_manager_; 290 std::unique_ptr<ClientSocketPoolManager> websocket_socket_pool_manager_;
291 QuicStreamFactory quic_stream_factory_; 291 QuicStreamFactory quic_stream_factory_;
292 SpdySessionPool spdy_session_pool_; 292 SpdySessionPool spdy_session_pool_;
293 std::unique_ptr<HttpStreamFactory> http_stream_factory_; 293 std::unique_ptr<HttpStreamFactory> http_stream_factory_;
294 std::unique_ptr<HttpStreamFactory> http_stream_factory_for_websocket_; 294 std::unique_ptr<HttpStreamFactory> http_stream_factory_for_websocket_;
295 std::set<HttpResponseBodyDrainer*> response_drainers_; 295 std::set<HttpResponseBodyDrainer*> response_drainers_;
296 296
297 NextProtoVector next_protos_; 297 NextProtoVector next_protos_;
298 bool enabled_protocols_[NUM_VALID_ALTERNATE_PROTOCOLS]; 298 bool enabled_protocols_[NUM_VALID_ALTERNATE_PROTOCOLS];
299 299
300 Params params_; 300 Params params_;
301 }; 301 };
302 302
303 } // namespace net 303 } // namespace net
304 304
305 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_ 305 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_
OLDNEW
« no previous file with comments | « net/http/http_network_layer_unittest.cc ('k') | net/http/http_network_transaction_ssl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698