| 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 29 matching lines...) Expand all Loading... |
| 40 namespace { | 40 namespace { |
| 41 | 41 |
| 42 HttpNetworkSession* CreateNetworkSession( | 42 HttpNetworkSession* CreateNetworkSession( |
| 43 HostResolver* host_resolver, | 43 HostResolver* host_resolver, |
| 44 CertVerifier* cert_verifier, | 44 CertVerifier* cert_verifier, |
| 45 OriginBoundCertService* origin_bound_cert_service, | 45 OriginBoundCertService* origin_bound_cert_service, |
| 46 DnsRRResolver* dnsrr_resolver, | 46 DnsRRResolver* dnsrr_resolver, |
| 47 DnsCertProvenanceChecker* dns_cert_checker, | 47 DnsCertProvenanceChecker* dns_cert_checker, |
| 48 ProxyService* proxy_service, | 48 ProxyService* proxy_service, |
| 49 SSLHostInfoFactory* ssl_host_info_factory, | 49 SSLHostInfoFactory* ssl_host_info_factory, |
| 50 SpdyConfigService* spdy_config_service, |
| 50 SSLConfigService* ssl_config_service, | 51 SSLConfigService* ssl_config_service, |
| 51 HttpAuthHandlerFactory* http_auth_handler_factory, | 52 HttpAuthHandlerFactory* http_auth_handler_factory, |
| 52 NetworkDelegate* network_delegate, | 53 NetworkDelegate* network_delegate, |
| 53 NetLog* net_log) { | 54 NetLog* net_log) { |
| 54 HttpNetworkSession::Params params; | 55 HttpNetworkSession::Params params; |
| 55 params.host_resolver = host_resolver; | 56 params.host_resolver = host_resolver; |
| 56 params.cert_verifier = cert_verifier; | 57 params.cert_verifier = cert_verifier; |
| 57 params.origin_bound_cert_service = origin_bound_cert_service; | 58 params.origin_bound_cert_service = origin_bound_cert_service; |
| 58 params.dnsrr_resolver = dnsrr_resolver; | 59 params.dnsrr_resolver = dnsrr_resolver; |
| 59 params.dns_cert_checker = dns_cert_checker; | 60 params.dns_cert_checker = dns_cert_checker; |
| 60 params.proxy_service = proxy_service; | 61 params.proxy_service = proxy_service; |
| 61 params.ssl_host_info_factory = ssl_host_info_factory; | 62 params.ssl_host_info_factory = ssl_host_info_factory; |
| 63 params.spdy_config_service = spdy_config_service; |
| 62 params.ssl_config_service = ssl_config_service; | 64 params.ssl_config_service = ssl_config_service; |
| 63 params.http_auth_handler_factory = http_auth_handler_factory; | 65 params.http_auth_handler_factory = http_auth_handler_factory; |
| 64 params.network_delegate = network_delegate; | 66 params.network_delegate = network_delegate; |
| 65 params.net_log = net_log; | 67 params.net_log = net_log; |
| 66 return new HttpNetworkSession(params); | 68 return new HttpNetworkSession(params); |
| 67 } | 69 } |
| 68 | 70 |
| 69 } // namespace | 71 } // namespace |
| 70 | 72 |
| 71 HttpCache::DefaultBackend::DefaultBackend(CacheType type, | 73 HttpCache::DefaultBackend::DefaultBackend(CacheType type, |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 HttpCache* const http_cache_; | 312 HttpCache* const http_cache_; |
| 311 }; | 313 }; |
| 312 | 314 |
| 313 //----------------------------------------------------------------------------- | 315 //----------------------------------------------------------------------------- |
| 314 HttpCache::HttpCache(HostResolver* host_resolver, | 316 HttpCache::HttpCache(HostResolver* host_resolver, |
| 315 CertVerifier* cert_verifier, | 317 CertVerifier* cert_verifier, |
| 316 OriginBoundCertService* origin_bound_cert_service, | 318 OriginBoundCertService* origin_bound_cert_service, |
| 317 DnsRRResolver* dnsrr_resolver, | 319 DnsRRResolver* dnsrr_resolver, |
| 318 DnsCertProvenanceChecker* dns_cert_checker_, | 320 DnsCertProvenanceChecker* dns_cert_checker_, |
| 319 ProxyService* proxy_service, | 321 ProxyService* proxy_service, |
| 322 SpdyConfigService* spdy_config_service, |
| 320 SSLConfigService* ssl_config_service, | 323 SSLConfigService* ssl_config_service, |
| 321 HttpAuthHandlerFactory* http_auth_handler_factory, | 324 HttpAuthHandlerFactory* http_auth_handler_factory, |
| 322 NetworkDelegate* network_delegate, | 325 NetworkDelegate* network_delegate, |
| 323 NetLog* net_log, | 326 NetLog* net_log, |
| 324 BackendFactory* backend_factory) | 327 BackendFactory* backend_factory) |
| 325 : net_log_(net_log), | 328 : net_log_(net_log), |
| 326 backend_factory_(backend_factory), | 329 backend_factory_(backend_factory), |
| 327 building_backend_(false), | 330 building_backend_(false), |
| 328 mode_(NORMAL), | 331 mode_(NORMAL), |
| 329 ssl_host_info_factory_(new SSLHostInfoFactoryAdaptor( | 332 ssl_host_info_factory_(new SSLHostInfoFactoryAdaptor( |
| 330 cert_verifier, | 333 cert_verifier, |
| 331 ALLOW_THIS_IN_INITIALIZER_LIST(this))), | 334 ALLOW_THIS_IN_INITIALIZER_LIST(this))), |
| 332 network_layer_( | 335 network_layer_( |
| 333 new HttpNetworkLayer( | 336 new HttpNetworkLayer( |
| 334 CreateNetworkSession( | 337 CreateNetworkSession( |
| 335 host_resolver, | 338 host_resolver, |
| 336 cert_verifier, | 339 cert_verifier, |
| 337 origin_bound_cert_service, | 340 origin_bound_cert_service, |
| 338 dnsrr_resolver, | 341 dnsrr_resolver, |
| 339 dns_cert_checker_, | 342 dns_cert_checker_, |
| 340 proxy_service, | 343 proxy_service, |
| 341 ssl_host_info_factory_.get(), | 344 ssl_host_info_factory_.get(), |
| 345 spdy_config_service, |
| 342 ssl_config_service, | 346 ssl_config_service, |
| 343 http_auth_handler_factory, | 347 http_auth_handler_factory, |
| 344 network_delegate, | 348 network_delegate, |
| 345 net_log))), | 349 net_log))), |
| 346 ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)) { | 350 ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)) { |
| 347 } | 351 } |
| 348 | 352 |
| 349 | 353 |
| 350 HttpCache::HttpCache(HttpNetworkSession* session, | 354 HttpCache::HttpCache(HttpNetworkSession* session, |
| 351 BackendFactory* backend_factory) | 355 BackendFactory* backend_factory) |
| (...skipping 797 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1149 building_backend_ = false; | 1153 building_backend_ = false; |
| 1150 DeletePendingOp(pending_op); | 1154 DeletePendingOp(pending_op); |
| 1151 } | 1155 } |
| 1152 | 1156 |
| 1153 // The cache may be gone when we return from the callback. | 1157 // The cache may be gone when we return from the callback. |
| 1154 if (!item->DoCallback(result, backend)) | 1158 if (!item->DoCallback(result, backend)) |
| 1155 item->NotifyTransaction(result, NULL); | 1159 item->NotifyTransaction(result, NULL); |
| 1156 } | 1160 } |
| 1157 | 1161 |
| 1158 } // namespace net | 1162 } // namespace net |
| OLD | NEW |