| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 27 matching lines...) Expand all Loading... |
| 38 #include "net/http/http_util.h" | 38 #include "net/http/http_util.h" |
| 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 ServerBoundCertService* server_bound_cert_service, |
| 49 TransportSecurityState* transport_security_state, | 49 TransportSecurityState* transport_security_state, |
| 50 ProxyService* proxy_service, | 50 ProxyService* proxy_service, |
| 51 SSLHostInfoFactory* ssl_host_info_factory, | 51 SSLHostInfoFactory* ssl_host_info_factory, |
| 52 const std::string& ssl_session_cache_shard, | 52 const std::string& ssl_session_cache_shard, |
| 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.server_bound_cert_service = server_bound_cert_service; |
| 62 params.transport_security_state = transport_security_state; | 62 params.transport_security_state = transport_security_state; |
| 63 params.proxy_service = proxy_service; | 63 params.proxy_service = proxy_service; |
| 64 params.ssl_host_info_factory = ssl_host_info_factory; | 64 params.ssl_host_info_factory = ssl_host_info_factory; |
| 65 params.ssl_session_cache_shard = ssl_session_cache_shard; | 65 params.ssl_session_cache_shard = ssl_session_cache_shard; |
| 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); |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 } | 291 } |
| 292 | 292 |
| 293 private: | 293 private: |
| 294 CertVerifier* const cert_verifier_; | 294 CertVerifier* const cert_verifier_; |
| 295 HttpCache* const http_cache_; | 295 HttpCache* const http_cache_; |
| 296 }; | 296 }; |
| 297 | 297 |
| 298 //----------------------------------------------------------------------------- | 298 //----------------------------------------------------------------------------- |
| 299 HttpCache::HttpCache(HostResolver* host_resolver, | 299 HttpCache::HttpCache(HostResolver* host_resolver, |
| 300 CertVerifier* cert_verifier, | 300 CertVerifier* cert_verifier, |
| 301 OriginBoundCertService* origin_bound_cert_service, | 301 ServerBoundCertService* server_bound_cert_service, |
| 302 TransportSecurityState* transport_security_state, | 302 TransportSecurityState* transport_security_state, |
| 303 ProxyService* proxy_service, | 303 ProxyService* proxy_service, |
| 304 const std::string& ssl_session_cache_shard, | 304 const std::string& ssl_session_cache_shard, |
| 305 SSLConfigService* ssl_config_service, | 305 SSLConfigService* ssl_config_service, |
| 306 HttpAuthHandlerFactory* http_auth_handler_factory, | 306 HttpAuthHandlerFactory* http_auth_handler_factory, |
| 307 NetworkDelegate* network_delegate, | 307 NetworkDelegate* network_delegate, |
| 308 HttpServerProperties* http_server_properties, | 308 HttpServerProperties* http_server_properties, |
| 309 NetLog* net_log, | 309 NetLog* net_log, |
| 310 BackendFactory* backend_factory) | 310 BackendFactory* backend_factory) |
| 311 : net_log_(net_log), | 311 : net_log_(net_log), |
| 312 backend_factory_(backend_factory), | 312 backend_factory_(backend_factory), |
| 313 building_backend_(false), | 313 building_backend_(false), |
| 314 mode_(NORMAL), | 314 mode_(NORMAL), |
| 315 ssl_host_info_factory_(new SSLHostInfoFactoryAdaptor( | 315 ssl_host_info_factory_(new SSLHostInfoFactoryAdaptor( |
| 316 cert_verifier, | 316 cert_verifier, |
| 317 ALLOW_THIS_IN_INITIALIZER_LIST(this))), | 317 ALLOW_THIS_IN_INITIALIZER_LIST(this))), |
| 318 network_layer_( | 318 network_layer_( |
| 319 new HttpNetworkLayer( | 319 new HttpNetworkLayer( |
| 320 CreateNetworkSession( | 320 CreateNetworkSession( |
| 321 host_resolver, | 321 host_resolver, |
| 322 cert_verifier, | 322 cert_verifier, |
| 323 origin_bound_cert_service, | 323 server_bound_cert_service, |
| 324 transport_security_state, | 324 transport_security_state, |
| 325 proxy_service, | 325 proxy_service, |
| 326 ssl_host_info_factory_.get(), | 326 ssl_host_info_factory_.get(), |
| 327 ssl_session_cache_shard, | 327 ssl_session_cache_shard, |
| 328 ssl_config_service, | 328 ssl_config_service, |
| 329 http_auth_handler_factory, | 329 http_auth_handler_factory, |
| 330 network_delegate, | 330 network_delegate, |
| 331 http_server_properties, | 331 http_server_properties, |
| 332 net_log))) { | 332 net_log))) { |
| 333 } | 333 } |
| (...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1169 building_backend_ = false; | 1169 building_backend_ = false; |
| 1170 DeletePendingOp(pending_op); | 1170 DeletePendingOp(pending_op); |
| 1171 } | 1171 } |
| 1172 | 1172 |
| 1173 // The cache may be gone when we return from the callback. | 1173 // The cache may be gone when we return from the callback. |
| 1174 if (!item->DoCallback(result, backend)) | 1174 if (!item->DoCallback(result, backend)) |
| 1175 item->NotifyTransaction(result, NULL); | 1175 item->NotifyTransaction(result, NULL); |
| 1176 } | 1176 } |
| 1177 | 1177 |
| 1178 } // namespace net | 1178 } // namespace net |
| OLD | NEW |