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/proxy/proxy_script_fetcher_impl.h" | 5 #include "net/proxy/proxy_script_fetcher_impl.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 storage_.set_transport_security_state( | 86 storage_.set_transport_security_state( |
87 base::WrapUnique(new TransportSecurityState)); | 87 base::WrapUnique(new TransportSecurityState)); |
88 storage_.set_cert_transparency_verifier( | 88 storage_.set_cert_transparency_verifier( |
89 base::WrapUnique(new MultiLogCTVerifier)); | 89 base::WrapUnique(new MultiLogCTVerifier)); |
90 storage_.set_ct_policy_enforcer(base::WrapUnique(new CTPolicyEnforcer)); | 90 storage_.set_ct_policy_enforcer(base::WrapUnique(new CTPolicyEnforcer)); |
91 storage_.set_proxy_service(ProxyService::CreateFixed(no_proxy)); | 91 storage_.set_proxy_service(ProxyService::CreateFixed(no_proxy)); |
92 storage_.set_ssl_config_service(new SSLConfigServiceDefaults); | 92 storage_.set_ssl_config_service(new SSLConfigServiceDefaults); |
93 storage_.set_http_server_properties( | 93 storage_.set_http_server_properties( |
94 std::unique_ptr<HttpServerProperties>(new HttpServerPropertiesImpl())); | 94 std::unique_ptr<HttpServerProperties>(new HttpServerPropertiesImpl())); |
95 | 95 |
96 HttpNetworkSession::Params params; | 96 HttpNetworkSession::Context session_context; |
97 params.host_resolver = host_resolver(); | 97 session_context.host_resolver = host_resolver(); |
98 params.cert_verifier = cert_verifier(); | 98 session_context.cert_verifier = cert_verifier(); |
99 params.transport_security_state = transport_security_state(); | 99 session_context.transport_security_state = transport_security_state(); |
100 params.cert_transparency_verifier = cert_transparency_verifier(); | 100 session_context.cert_transparency_verifier = cert_transparency_verifier(); |
101 params.ct_policy_enforcer = ct_policy_enforcer(); | 101 session_context.ct_policy_enforcer = ct_policy_enforcer(); |
102 params.proxy_service = proxy_service(); | 102 session_context.proxy_service = proxy_service(); |
103 params.ssl_config_service = ssl_config_service(); | 103 session_context.ssl_config_service = ssl_config_service(); |
104 params.http_server_properties = http_server_properties(); | 104 session_context.http_server_properties = http_server_properties(); |
105 storage_.set_http_network_session( | 105 storage_.set_http_network_session(base::MakeUnique<HttpNetworkSession>( |
106 base::MakeUnique<HttpNetworkSession>(params)); | 106 HttpNetworkSession::Params(), session_context)); |
107 storage_.set_http_transaction_factory(base::MakeUnique<HttpCache>( | 107 storage_.set_http_transaction_factory(base::MakeUnique<HttpCache>( |
108 storage_.http_network_session(), HttpCache::DefaultBackend::InMemory(0), | 108 storage_.http_network_session(), HttpCache::DefaultBackend::InMemory(0), |
109 false)); | 109 false)); |
110 std::unique_ptr<URLRequestJobFactoryImpl> job_factory = | 110 std::unique_ptr<URLRequestJobFactoryImpl> job_factory = |
111 base::MakeUnique<URLRequestJobFactoryImpl>(); | 111 base::MakeUnique<URLRequestJobFactoryImpl>(); |
112 #if !BUILDFLAG(DISABLE_FILE_SUPPORT) | 112 #if !BUILDFLAG(DISABLE_FILE_SUPPORT) |
113 job_factory->SetProtocolHandler("file", | 113 job_factory->SetProtocolHandler("file", |
114 base::MakeUnique<FileProtocolHandler>( | 114 base::MakeUnique<FileProtocolHandler>( |
115 base::ThreadTaskRunnerHandle::Get())); | 115 base::ThreadTaskRunnerHandle::Get())); |
116 #endif | 116 #endif |
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
579 TestCompletionCallback callback; | 579 TestCompletionCallback callback; |
580 int result = pac_fetcher.Fetch(test_server_.GetURL("/hung"), &text, | 580 int result = pac_fetcher.Fetch(test_server_.GetURL("/hung"), &text, |
581 callback.callback()); | 581 callback.callback()); |
582 EXPECT_THAT(result, IsError(ERR_CONTEXT_SHUT_DOWN)); | 582 EXPECT_THAT(result, IsError(ERR_CONTEXT_SHUT_DOWN)); |
583 EXPECT_EQ(0u, context_.url_requests().size()); | 583 EXPECT_EQ(0u, context_.url_requests().size()); |
584 } | 584 } |
585 | 585 |
586 } // namespace | 586 } // namespace |
587 | 587 |
588 } // namespace net | 588 } // namespace net |
OLD | NEW |