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