OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/cert_net/cert_net_fetcher_impl.h" | 5 #include "net/cert_net/cert_net_fetcher_impl.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 storage_.set_transport_security_state( | 50 storage_.set_transport_security_state( |
51 base::WrapUnique(new TransportSecurityState)); | 51 base::WrapUnique(new TransportSecurityState)); |
52 storage_.set_cert_transparency_verifier( | 52 storage_.set_cert_transparency_verifier( |
53 base::WrapUnique(new MultiLogCTVerifier)); | 53 base::WrapUnique(new MultiLogCTVerifier)); |
54 storage_.set_ct_policy_enforcer(base::WrapUnique(new CTPolicyEnforcer)); | 54 storage_.set_ct_policy_enforcer(base::WrapUnique(new CTPolicyEnforcer)); |
55 storage_.set_proxy_service(ProxyService::CreateFixed(no_proxy)); | 55 storage_.set_proxy_service(ProxyService::CreateFixed(no_proxy)); |
56 storage_.set_ssl_config_service(new SSLConfigServiceDefaults); | 56 storage_.set_ssl_config_service(new SSLConfigServiceDefaults); |
57 storage_.set_http_server_properties( | 57 storage_.set_http_server_properties( |
58 std::unique_ptr<HttpServerProperties>(new HttpServerPropertiesImpl())); | 58 std::unique_ptr<HttpServerProperties>(new HttpServerPropertiesImpl())); |
59 | 59 |
60 HttpNetworkSession::Params params; | 60 HttpNetworkSession::Context session_context; |
61 params.host_resolver = host_resolver(); | 61 session_context.host_resolver = host_resolver(); |
62 params.cert_verifier = cert_verifier(); | 62 session_context.cert_verifier = cert_verifier(); |
63 params.transport_security_state = transport_security_state(); | 63 session_context.transport_security_state = transport_security_state(); |
64 params.cert_transparency_verifier = cert_transparency_verifier(); | 64 session_context.cert_transparency_verifier = cert_transparency_verifier(); |
65 params.ct_policy_enforcer = ct_policy_enforcer(); | 65 session_context.ct_policy_enforcer = ct_policy_enforcer(); |
66 params.proxy_service = proxy_service(); | 66 session_context.proxy_service = proxy_service(); |
67 params.ssl_config_service = ssl_config_service(); | 67 session_context.ssl_config_service = ssl_config_service(); |
68 params.http_server_properties = http_server_properties(); | 68 session_context.http_server_properties = http_server_properties(); |
69 storage_.set_http_network_session( | 69 storage_.set_http_network_session(base::MakeUnique<HttpNetworkSession>( |
70 base::MakeUnique<HttpNetworkSession>(params)); | 70 HttpNetworkSession::Params(), session_context)); |
71 storage_.set_http_transaction_factory(base::MakeUnique<HttpCache>( | 71 storage_.set_http_transaction_factory(base::MakeUnique<HttpCache>( |
72 storage_.http_network_session(), HttpCache::DefaultBackend::InMemory(0), | 72 storage_.http_network_session(), HttpCache::DefaultBackend::InMemory(0), |
73 false /* is_main_cache */)); | 73 false /* is_main_cache */)); |
74 storage_.set_job_factory(base::MakeUnique<URLRequestJobFactoryImpl>()); | 74 storage_.set_job_factory(base::MakeUnique<URLRequestJobFactoryImpl>()); |
75 } | 75 } |
76 | 76 |
77 ~RequestContext() override { AssertNoURLRequests(); } | 77 ~RequestContext() override { AssertNoURLRequests(); } |
78 | 78 |
79 private: | 79 private: |
80 URLRequestContextStorage storage_; | 80 URLRequestContextStorage storage_; |
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
630 std::unique_ptr<CertNetFetcher::Request> request = | 630 std::unique_ptr<CertNetFetcher::Request> request = |
631 StartRequest(fetcher(), url); | 631 StartRequest(fetcher(), url); |
632 | 632 |
633 ShutDownFetcher(); | 633 ShutDownFetcher(); |
634 VerifyFailure(ERR_ABORTED, request.get()); | 634 VerifyFailure(ERR_ABORTED, request.get()); |
635 } | 635 } |
636 | 636 |
637 } // namespace | 637 } // namespace |
638 | 638 |
639 } // namespace net | 639 } // namespace net |
OLD | NEW |