OLD | NEW |
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_cache.h" | 5 #include "net/http/http_cache.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 | 10 |
(...skipping 28 matching lines...) Expand all Loading... |
39 | 39 |
40 namespace net { | 40 namespace net { |
41 | 41 |
42 namespace { | 42 namespace { |
43 | 43 |
44 HttpNetworkSession* CreateNetworkSession( | 44 HttpNetworkSession* CreateNetworkSession( |
45 HostResolver* host_resolver, | 45 HostResolver* host_resolver, |
46 CertVerifier* cert_verifier, | 46 CertVerifier* cert_verifier, |
47 OriginBoundCertService* origin_bound_cert_service, | 47 OriginBoundCertService* origin_bound_cert_service, |
48 TransportSecurityState* transport_security_state, | 48 TransportSecurityState* transport_security_state, |
49 DnsCertProvenanceChecker* dns_cert_checker, | |
50 ProxyService* proxy_service, | 49 ProxyService* proxy_service, |
51 SSLHostInfoFactory* ssl_host_info_factory, | 50 SSLHostInfoFactory* ssl_host_info_factory, |
52 const std::string& ssl_session_cache_shard, | 51 const std::string& ssl_session_cache_shard, |
53 SSLConfigService* ssl_config_service, | 52 SSLConfigService* ssl_config_service, |
54 HttpAuthHandlerFactory* http_auth_handler_factory, | 53 HttpAuthHandlerFactory* http_auth_handler_factory, |
55 NetworkDelegate* network_delegate, | 54 NetworkDelegate* network_delegate, |
56 HttpServerProperties* http_server_properties, | 55 HttpServerProperties* http_server_properties, |
57 NetLog* net_log) { | 56 NetLog* net_log) { |
58 HttpNetworkSession::Params params; | 57 HttpNetworkSession::Params params; |
59 params.host_resolver = host_resolver; | 58 params.host_resolver = host_resolver; |
60 params.cert_verifier = cert_verifier; | 59 params.cert_verifier = cert_verifier; |
61 params.origin_bound_cert_service = origin_bound_cert_service; | 60 params.origin_bound_cert_service = origin_bound_cert_service; |
62 params.transport_security_state = transport_security_state; | 61 params.transport_security_state = transport_security_state; |
63 params.dns_cert_checker = dns_cert_checker; | |
64 params.proxy_service = proxy_service; | 62 params.proxy_service = proxy_service; |
65 params.ssl_host_info_factory = ssl_host_info_factory; | 63 params.ssl_host_info_factory = ssl_host_info_factory; |
66 params.ssl_session_cache_shard = ssl_session_cache_shard; | 64 params.ssl_session_cache_shard = ssl_session_cache_shard; |
67 params.ssl_config_service = ssl_config_service; | 65 params.ssl_config_service = ssl_config_service; |
68 params.http_auth_handler_factory = http_auth_handler_factory; | 66 params.http_auth_handler_factory = http_auth_handler_factory; |
69 params.network_delegate = network_delegate; | 67 params.network_delegate = network_delegate; |
70 params.http_server_properties = http_server_properties; | 68 params.http_server_properties = http_server_properties; |
71 params.net_log = net_log; | 69 params.net_log = net_log; |
72 return new HttpNetworkSession(params); | 70 return new HttpNetworkSession(params); |
73 } | 71 } |
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 private: | 312 private: |
315 CertVerifier* const cert_verifier_; | 313 CertVerifier* const cert_verifier_; |
316 HttpCache* const http_cache_; | 314 HttpCache* const http_cache_; |
317 }; | 315 }; |
318 | 316 |
319 //----------------------------------------------------------------------------- | 317 //----------------------------------------------------------------------------- |
320 HttpCache::HttpCache(HostResolver* host_resolver, | 318 HttpCache::HttpCache(HostResolver* host_resolver, |
321 CertVerifier* cert_verifier, | 319 CertVerifier* cert_verifier, |
322 OriginBoundCertService* origin_bound_cert_service, | 320 OriginBoundCertService* origin_bound_cert_service, |
323 TransportSecurityState* transport_security_state, | 321 TransportSecurityState* transport_security_state, |
324 DnsCertProvenanceChecker* dns_cert_checker_, | |
325 ProxyService* proxy_service, | 322 ProxyService* proxy_service, |
326 const std::string& ssl_session_cache_shard, | 323 const std::string& ssl_session_cache_shard, |
327 SSLConfigService* ssl_config_service, | 324 SSLConfigService* ssl_config_service, |
328 HttpAuthHandlerFactory* http_auth_handler_factory, | 325 HttpAuthHandlerFactory* http_auth_handler_factory, |
329 NetworkDelegate* network_delegate, | 326 NetworkDelegate* network_delegate, |
330 HttpServerProperties* http_server_properties, | 327 HttpServerProperties* http_server_properties, |
331 NetLog* net_log, | 328 NetLog* net_log, |
332 BackendFactory* backend_factory) | 329 BackendFactory* backend_factory) |
333 : net_log_(net_log), | 330 : net_log_(net_log), |
334 backend_factory_(backend_factory), | 331 backend_factory_(backend_factory), |
335 building_backend_(false), | 332 building_backend_(false), |
336 mode_(NORMAL), | 333 mode_(NORMAL), |
337 ssl_host_info_factory_(new SSLHostInfoFactoryAdaptor( | 334 ssl_host_info_factory_(new SSLHostInfoFactoryAdaptor( |
338 cert_verifier, | 335 cert_verifier, |
339 ALLOW_THIS_IN_INITIALIZER_LIST(this))), | 336 ALLOW_THIS_IN_INITIALIZER_LIST(this))), |
340 network_layer_( | 337 network_layer_( |
341 new HttpNetworkLayer( | 338 new HttpNetworkLayer( |
342 CreateNetworkSession( | 339 CreateNetworkSession( |
343 host_resolver, | 340 host_resolver, |
344 cert_verifier, | 341 cert_verifier, |
345 origin_bound_cert_service, | 342 origin_bound_cert_service, |
346 transport_security_state, | 343 transport_security_state, |
347 dns_cert_checker_, | |
348 proxy_service, | 344 proxy_service, |
349 ssl_host_info_factory_.get(), | 345 ssl_host_info_factory_.get(), |
350 ssl_session_cache_shard, | 346 ssl_session_cache_shard, |
351 ssl_config_service, | 347 ssl_config_service, |
352 http_auth_handler_factory, | 348 http_auth_handler_factory, |
353 network_delegate, | 349 network_delegate, |
354 http_server_properties, | 350 http_server_properties, |
355 net_log))) { | 351 net_log))) { |
356 } | 352 } |
357 | 353 |
(...skipping 807 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1165 building_backend_ = false; | 1161 building_backend_ = false; |
1166 DeletePendingOp(pending_op); | 1162 DeletePendingOp(pending_op); |
1167 } | 1163 } |
1168 | 1164 |
1169 // The cache may be gone when we return from the callback. | 1165 // The cache may be gone when we return from the callback. |
1170 if (!item->DoCallback(result, backend)) | 1166 if (!item->DoCallback(result, backend)) |
1171 item->NotifyTransaction(result, NULL); | 1167 item->NotifyTransaction(result, NULL); |
1172 } | 1168 } |
1173 | 1169 |
1174 } // namespace net | 1170 } // namespace net |
OLD | NEW |