| 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 #include "net/socket/ssl_host_info.h" | 39 #include "net/socket/ssl_host_info.h" |
| 40 | 40 |
| 41 namespace net { | 41 namespace net { |
| 42 | 42 |
| 43 namespace { | 43 namespace { |
| 44 | 44 |
| 45 HttpNetworkSession* CreateNetworkSession( | 45 HttpNetworkSession* CreateNetworkSession( |
| 46 HostResolver* host_resolver, | 46 HostResolver* host_resolver, |
| 47 CertVerifier* cert_verifier, | 47 CertVerifier* cert_verifier, |
| 48 OriginBoundCertService* origin_bound_cert_service, | 48 OriginBoundCertService* origin_bound_cert_service, |
| 49 DnsRRResolver* dnsrr_resolver, | 49 TransportSecurityState* transport_security_state, |
| 50 DnsCertProvenanceChecker* dns_cert_checker, | 50 DnsCertProvenanceChecker* dns_cert_checker, |
| 51 ProxyService* proxy_service, | 51 ProxyService* proxy_service, |
| 52 SSLHostInfoFactory* ssl_host_info_factory, | 52 SSLHostInfoFactory* ssl_host_info_factory, |
| 53 SSLConfigService* ssl_config_service, | 53 SSLConfigService* ssl_config_service, |
| 54 HttpAuthHandlerFactory* http_auth_handler_factory, | 54 HttpAuthHandlerFactory* http_auth_handler_factory, |
| 55 NetworkDelegate* network_delegate, | 55 NetworkDelegate* network_delegate, |
| 56 HttpServerProperties* http_server_properties, | 56 HttpServerProperties* http_server_properties, |
| 57 NetLog* net_log) { | 57 NetLog* net_log) { |
| 58 HttpNetworkSession::Params params; | 58 HttpNetworkSession::Params params; |
| 59 params.host_resolver = host_resolver; | 59 params.host_resolver = host_resolver; |
| 60 params.cert_verifier = cert_verifier; | 60 params.cert_verifier = cert_verifier; |
| 61 params.origin_bound_cert_service = origin_bound_cert_service; | 61 params.origin_bound_cert_service = origin_bound_cert_service; |
| 62 params.dnsrr_resolver = dnsrr_resolver; | 62 params.transport_security_state = transport_security_state; |
| 63 params.dns_cert_checker = dns_cert_checker; | 63 params.dns_cert_checker = dns_cert_checker; |
| 64 params.proxy_service = proxy_service; | 64 params.proxy_service = proxy_service; |
| 65 params.ssl_host_info_factory = ssl_host_info_factory; | 65 params.ssl_host_info_factory = ssl_host_info_factory; |
| 66 params.ssl_config_service = ssl_config_service; | 66 params.ssl_config_service = ssl_config_service; |
| 67 params.http_auth_handler_factory = http_auth_handler_factory; | 67 params.http_auth_handler_factory = http_auth_handler_factory; |
| 68 params.network_delegate = network_delegate; | 68 params.network_delegate = network_delegate; |
| 69 params.http_server_properties = http_server_properties; | 69 params.http_server_properties = http_server_properties; |
| 70 params.net_log = net_log; | 70 params.net_log = net_log; |
| 71 return new HttpNetworkSession(params); | 71 return new HttpNetworkSession(params); |
| 72 } | 72 } |
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 | 323 |
| 324 private: | 324 private: |
| 325 CertVerifier* const cert_verifier_; | 325 CertVerifier* const cert_verifier_; |
| 326 HttpCache* const http_cache_; | 326 HttpCache* const http_cache_; |
| 327 }; | 327 }; |
| 328 | 328 |
| 329 //----------------------------------------------------------------------------- | 329 //----------------------------------------------------------------------------- |
| 330 HttpCache::HttpCache(HostResolver* host_resolver, | 330 HttpCache::HttpCache(HostResolver* host_resolver, |
| 331 CertVerifier* cert_verifier, | 331 CertVerifier* cert_verifier, |
| 332 OriginBoundCertService* origin_bound_cert_service, | 332 OriginBoundCertService* origin_bound_cert_service, |
| 333 DnsRRResolver* dnsrr_resolver, | 333 TransportSecurityState* transport_security_state, |
| 334 DnsCertProvenanceChecker* dns_cert_checker_, | 334 DnsCertProvenanceChecker* dns_cert_checker_, |
| 335 ProxyService* proxy_service, | 335 ProxyService* proxy_service, |
| 336 SSLConfigService* ssl_config_service, | 336 SSLConfigService* ssl_config_service, |
| 337 HttpAuthHandlerFactory* http_auth_handler_factory, | 337 HttpAuthHandlerFactory* http_auth_handler_factory, |
| 338 NetworkDelegate* network_delegate, | 338 NetworkDelegate* network_delegate, |
| 339 HttpServerProperties* http_server_properties, | 339 HttpServerProperties* http_server_properties, |
| 340 NetLog* net_log, | 340 NetLog* net_log, |
| 341 BackendFactory* backend_factory) | 341 BackendFactory* backend_factory) |
| 342 : net_log_(net_log), | 342 : net_log_(net_log), |
| 343 backend_factory_(backend_factory), | 343 backend_factory_(backend_factory), |
| 344 building_backend_(false), | 344 building_backend_(false), |
| 345 mode_(NORMAL), | 345 mode_(NORMAL), |
| 346 ssl_host_info_factory_(new SSLHostInfoFactoryAdaptor( | 346 ssl_host_info_factory_(new SSLHostInfoFactoryAdaptor( |
| 347 cert_verifier, | 347 cert_verifier, |
| 348 ALLOW_THIS_IN_INITIALIZER_LIST(this))), | 348 ALLOW_THIS_IN_INITIALIZER_LIST(this))), |
| 349 network_layer_( | 349 network_layer_( |
| 350 new HttpNetworkLayer( | 350 new HttpNetworkLayer( |
| 351 CreateNetworkSession( | 351 CreateNetworkSession( |
| 352 host_resolver, | 352 host_resolver, |
| 353 cert_verifier, | 353 cert_verifier, |
| 354 origin_bound_cert_service, | 354 origin_bound_cert_service, |
| 355 dnsrr_resolver, | 355 transport_security_state, |
| 356 dns_cert_checker_, | 356 dns_cert_checker_, |
| 357 proxy_service, | 357 proxy_service, |
| 358 ssl_host_info_factory_.get(), | 358 ssl_host_info_factory_.get(), |
| 359 ssl_config_service, | 359 ssl_config_service, |
| 360 http_auth_handler_factory, | 360 http_auth_handler_factory, |
| 361 network_delegate, | 361 network_delegate, |
| 362 http_server_properties, | 362 http_server_properties, |
| 363 net_log))) { | 363 net_log))) { |
| 364 } | 364 } |
| 365 | 365 |
| (...skipping 812 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1178 building_backend_ = false; | 1178 building_backend_ = false; |
| 1179 DeletePendingOp(pending_op); | 1179 DeletePendingOp(pending_op); |
| 1180 } | 1180 } |
| 1181 | 1181 |
| 1182 // The cache may be gone when we return from the callback. | 1182 // The cache may be gone when we return from the callback. |
| 1183 if (!item->DoCallback(result, backend)) | 1183 if (!item->DoCallback(result, backend)) |
| 1184 item->NotifyTransaction(result, NULL); | 1184 item->NotifyTransaction(result, NULL); |
| 1185 } | 1185 } |
| 1186 | 1186 |
| 1187 } // namespace net | 1187 } // namespace net |
| OLD | NEW |