| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 HostResolver* host_resolver, | 44 HostResolver* host_resolver, |
| 45 CertVerifier* cert_verifier, | 45 CertVerifier* cert_verifier, |
| 46 OriginBoundCertService* origin_bound_cert_service, | 46 OriginBoundCertService* origin_bound_cert_service, |
| 47 DnsRRResolver* dnsrr_resolver, | 47 DnsRRResolver* dnsrr_resolver, |
| 48 DnsCertProvenanceChecker* dns_cert_checker, | 48 DnsCertProvenanceChecker* dns_cert_checker, |
| 49 ProxyService* proxy_service, | 49 ProxyService* proxy_service, |
| 50 SSLHostInfoFactory* ssl_host_info_factory, | 50 SSLHostInfoFactory* ssl_host_info_factory, |
| 51 SSLConfigService* ssl_config_service, | 51 SSLConfigService* ssl_config_service, |
| 52 HttpAuthHandlerFactory* http_auth_handler_factory, | 52 HttpAuthHandlerFactory* http_auth_handler_factory, |
| 53 NetworkDelegate* network_delegate, | 53 NetworkDelegate* network_delegate, |
| 54 HttpServerProperties* http_server_properties, |
| 54 NetLog* net_log) { | 55 NetLog* net_log) { |
| 55 HttpNetworkSession::Params params; | 56 HttpNetworkSession::Params params; |
| 56 params.host_resolver = host_resolver; | 57 params.host_resolver = host_resolver; |
| 57 params.cert_verifier = cert_verifier; | 58 params.cert_verifier = cert_verifier; |
| 58 params.origin_bound_cert_service = origin_bound_cert_service; | 59 params.origin_bound_cert_service = origin_bound_cert_service; |
| 59 params.dnsrr_resolver = dnsrr_resolver; | 60 params.dnsrr_resolver = dnsrr_resolver; |
| 60 params.dns_cert_checker = dns_cert_checker; | 61 params.dns_cert_checker = dns_cert_checker; |
| 61 params.proxy_service = proxy_service; | 62 params.proxy_service = proxy_service; |
| 62 params.ssl_host_info_factory = ssl_host_info_factory; | 63 params.ssl_host_info_factory = ssl_host_info_factory; |
| 63 params.ssl_config_service = ssl_config_service; | 64 params.ssl_config_service = ssl_config_service; |
| 64 params.http_auth_handler_factory = http_auth_handler_factory; | 65 params.http_auth_handler_factory = http_auth_handler_factory; |
| 65 params.network_delegate = network_delegate; | 66 params.network_delegate = network_delegate; |
| 67 params.http_server_properties = http_server_properties; |
| 66 params.net_log = net_log; | 68 params.net_log = net_log; |
| 67 return new HttpNetworkSession(params); | 69 return new HttpNetworkSession(params); |
| 68 } | 70 } |
| 69 | 71 |
| 70 } // namespace | 72 } // namespace |
| 71 | 73 |
| 72 HttpCache::DefaultBackend::DefaultBackend(CacheType type, | 74 HttpCache::DefaultBackend::DefaultBackend(CacheType type, |
| 73 const FilePath& path, | 75 const FilePath& path, |
| 74 int max_bytes, | 76 int max_bytes, |
| 75 base::MessageLoopProxy* thread) | 77 base::MessageLoopProxy* thread) |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 314 //----------------------------------------------------------------------------- | 316 //----------------------------------------------------------------------------- |
| 315 HttpCache::HttpCache(HostResolver* host_resolver, | 317 HttpCache::HttpCache(HostResolver* host_resolver, |
| 316 CertVerifier* cert_verifier, | 318 CertVerifier* cert_verifier, |
| 317 OriginBoundCertService* origin_bound_cert_service, | 319 OriginBoundCertService* origin_bound_cert_service, |
| 318 DnsRRResolver* dnsrr_resolver, | 320 DnsRRResolver* dnsrr_resolver, |
| 319 DnsCertProvenanceChecker* dns_cert_checker_, | 321 DnsCertProvenanceChecker* dns_cert_checker_, |
| 320 ProxyService* proxy_service, | 322 ProxyService* proxy_service, |
| 321 SSLConfigService* ssl_config_service, | 323 SSLConfigService* ssl_config_service, |
| 322 HttpAuthHandlerFactory* http_auth_handler_factory, | 324 HttpAuthHandlerFactory* http_auth_handler_factory, |
| 323 NetworkDelegate* network_delegate, | 325 NetworkDelegate* network_delegate, |
| 326 HttpServerProperties* http_server_properties, |
| 324 NetLog* net_log, | 327 NetLog* net_log, |
| 325 BackendFactory* backend_factory) | 328 BackendFactory* backend_factory) |
| 326 : net_log_(net_log), | 329 : net_log_(net_log), |
| 327 backend_factory_(backend_factory), | 330 backend_factory_(backend_factory), |
| 328 building_backend_(false), | 331 building_backend_(false), |
| 329 mode_(NORMAL), | 332 mode_(NORMAL), |
| 330 ssl_host_info_factory_(new SSLHostInfoFactoryAdaptor( | 333 ssl_host_info_factory_(new SSLHostInfoFactoryAdaptor( |
| 331 cert_verifier, | 334 cert_verifier, |
| 332 ALLOW_THIS_IN_INITIALIZER_LIST(this))), | 335 ALLOW_THIS_IN_INITIALIZER_LIST(this))), |
| 333 network_layer_( | 336 network_layer_( |
| 334 new HttpNetworkLayer( | 337 new HttpNetworkLayer( |
| 335 CreateNetworkSession( | 338 CreateNetworkSession( |
| 336 host_resolver, | 339 host_resolver, |
| 337 cert_verifier, | 340 cert_verifier, |
| 338 origin_bound_cert_service, | 341 origin_bound_cert_service, |
| 339 dnsrr_resolver, | 342 dnsrr_resolver, |
| 340 dns_cert_checker_, | 343 dns_cert_checker_, |
| 341 proxy_service, | 344 proxy_service, |
| 342 ssl_host_info_factory_.get(), | 345 ssl_host_info_factory_.get(), |
| 343 ssl_config_service, | 346 ssl_config_service, |
| 344 http_auth_handler_factory, | 347 http_auth_handler_factory, |
| 345 network_delegate, | 348 network_delegate, |
| 349 http_server_properties, |
| 346 net_log))), | 350 net_log))), |
| 347 ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)) { | 351 ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)) { |
| 348 } | 352 } |
| 349 | 353 |
| 350 | 354 |
| 351 HttpCache::HttpCache(HttpNetworkSession* session, | 355 HttpCache::HttpCache(HttpNetworkSession* session, |
| 352 BackendFactory* backend_factory) | 356 BackendFactory* backend_factory) |
| 353 : net_log_(session->net_log()), | 357 : net_log_(session->net_log()), |
| 354 backend_factory_(backend_factory), | 358 backend_factory_(backend_factory), |
| 355 building_backend_(false), | 359 building_backend_(false), |
| (...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1158 building_backend_ = false; | 1162 building_backend_ = false; |
| 1159 DeletePendingOp(pending_op); | 1163 DeletePendingOp(pending_op); |
| 1160 } | 1164 } |
| 1161 | 1165 |
| 1162 // The cache may be gone when we return from the callback. | 1166 // The cache may be gone when we return from the callback. |
| 1163 if (!item->DoCallback(result, backend)) | 1167 if (!item->DoCallback(result, backend)) |
| 1164 item->NotifyTransaction(result, NULL); | 1168 item->NotifyTransaction(result, NULL); |
| 1165 } | 1169 } |
| 1166 | 1170 |
| 1167 } // namespace net | 1171 } // namespace net |
| OLD | NEW |