Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Side by Side Diff: net/http/http_cache.cc

Issue 8692012: net: replace DnsRRResoler with TransportSecurityState in plumbing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 27 matching lines...) Expand all
38 #include "net/socket/ssl_host_info.h" 38 #include "net/socket/ssl_host_info.h"
39 39
40 namespace net { 40 namespace net {
41 41
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 DnsRRResolver* dnsrr_resolver, 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 SSLConfigService* ssl_config_service, 52 SSLConfigService* ssl_config_service,
53 HttpAuthHandlerFactory* http_auth_handler_factory, 53 HttpAuthHandlerFactory* http_auth_handler_factory,
54 NetworkDelegate* network_delegate, 54 NetworkDelegate* network_delegate,
55 HttpServerProperties* http_server_properties, 55 HttpServerProperties* http_server_properties,
56 NetLog* net_log) { 56 NetLog* net_log) {
57 HttpNetworkSession::Params params; 57 HttpNetworkSession::Params params;
58 params.host_resolver = host_resolver; 58 params.host_resolver = host_resolver;
59 params.cert_verifier = cert_verifier; 59 params.cert_verifier = cert_verifier;
60 params.origin_bound_cert_service = origin_bound_cert_service; 60 params.origin_bound_cert_service = origin_bound_cert_service;
61 params.dnsrr_resolver = dnsrr_resolver; 61 params.transport_security_state = transport_security_state;
62 params.dns_cert_checker = dns_cert_checker; 62 params.dns_cert_checker = dns_cert_checker;
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_config_service = ssl_config_service; 65 params.ssl_config_service = ssl_config_service;
66 params.http_auth_handler_factory = http_auth_handler_factory; 66 params.http_auth_handler_factory = http_auth_handler_factory;
67 params.network_delegate = network_delegate; 67 params.network_delegate = network_delegate;
68 params.http_server_properties = http_server_properties; 68 params.http_server_properties = http_server_properties;
69 params.net_log = net_log; 69 params.net_log = net_log;
70 return new HttpNetworkSession(params); 70 return new HttpNetworkSession(params);
71 } 71 }
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 311
312 private: 312 private:
313 CertVerifier* const cert_verifier_; 313 CertVerifier* const cert_verifier_;
314 HttpCache* const http_cache_; 314 HttpCache* const http_cache_;
315 }; 315 };
316 316
317 //----------------------------------------------------------------------------- 317 //-----------------------------------------------------------------------------
318 HttpCache::HttpCache(HostResolver* host_resolver, 318 HttpCache::HttpCache(HostResolver* host_resolver,
319 CertVerifier* cert_verifier, 319 CertVerifier* cert_verifier,
320 OriginBoundCertService* origin_bound_cert_service, 320 OriginBoundCertService* origin_bound_cert_service,
321 DnsRRResolver* dnsrr_resolver, 321 TransportSecurityState* transport_security_state,
322 DnsCertProvenanceChecker* dns_cert_checker_, 322 DnsCertProvenanceChecker* dns_cert_checker_,
323 ProxyService* proxy_service, 323 ProxyService* proxy_service,
324 SSLConfigService* ssl_config_service, 324 SSLConfigService* ssl_config_service,
325 HttpAuthHandlerFactory* http_auth_handler_factory, 325 HttpAuthHandlerFactory* http_auth_handler_factory,
326 NetworkDelegate* network_delegate, 326 NetworkDelegate* network_delegate,
327 HttpServerProperties* http_server_properties, 327 HttpServerProperties* http_server_properties,
328 NetLog* net_log, 328 NetLog* net_log,
329 BackendFactory* backend_factory) 329 BackendFactory* backend_factory)
330 : net_log_(net_log), 330 : net_log_(net_log),
331 backend_factory_(backend_factory), 331 backend_factory_(backend_factory),
332 building_backend_(false), 332 building_backend_(false),
333 mode_(NORMAL), 333 mode_(NORMAL),
334 ssl_host_info_factory_(new SSLHostInfoFactoryAdaptor( 334 ssl_host_info_factory_(new SSLHostInfoFactoryAdaptor(
335 cert_verifier, 335 cert_verifier,
336 ALLOW_THIS_IN_INITIALIZER_LIST(this))), 336 ALLOW_THIS_IN_INITIALIZER_LIST(this))),
337 network_layer_( 337 network_layer_(
338 new HttpNetworkLayer( 338 new HttpNetworkLayer(
339 CreateNetworkSession( 339 CreateNetworkSession(
340 host_resolver, 340 host_resolver,
341 cert_verifier, 341 cert_verifier,
342 origin_bound_cert_service, 342 origin_bound_cert_service,
343 dnsrr_resolver, 343 transport_security_state,
344 dns_cert_checker_, 344 dns_cert_checker_,
345 proxy_service, 345 proxy_service,
346 ssl_host_info_factory_.get(), 346 ssl_host_info_factory_.get(),
347 ssl_config_service, 347 ssl_config_service,
348 http_auth_handler_factory, 348 http_auth_handler_factory,
349 network_delegate, 349 network_delegate,
350 http_server_properties, 350 http_server_properties,
351 net_log))) { 351 net_log))) {
352 } 352 }
353 353
(...skipping 807 matching lines...) Expand 10 before | Expand all | Expand 10 after
1161 building_backend_ = false; 1161 building_backend_ = false;
1162 DeletePendingOp(pending_op); 1162 DeletePendingOp(pending_op);
1163 } 1163 }
1164 1164
1165 // The cache may be gone when we return from the callback. 1165 // The cache may be gone when we return from the callback.
1166 if (!item->DoCallback(result, backend)) 1166 if (!item->DoCallback(result, backend))
1167 item->NotifyTransaction(result, NULL); 1167 item->NotifyTransaction(result, NULL);
1168 } 1168 }
1169 1169
1170 } // namespace net 1170 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698