OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ios/web_view/internal/web_view_url_request_context_getter.h" | 5 #include "ios/web_view/internal/web_view_url_request_context_getter.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 std::unique_ptr<net::HttpServerProperties>( | 112 std::unique_ptr<net::HttpServerProperties>( |
113 new net::HttpServerPropertiesImpl())); | 113 new net::HttpServerPropertiesImpl())); |
114 | 114 |
115 std::unique_ptr<net::HostResolver> host_resolver( | 115 std::unique_ptr<net::HostResolver> host_resolver( |
116 net::HostResolver::CreateDefaultResolver( | 116 net::HostResolver::CreateDefaultResolver( |
117 url_request_context_->net_log())); | 117 url_request_context_->net_log())); |
118 storage_->set_http_auth_handler_factory( | 118 storage_->set_http_auth_handler_factory( |
119 net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get())); | 119 net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get())); |
120 storage_->set_host_resolver(std::move(host_resolver)); | 120 storage_->set_host_resolver(std::move(host_resolver)); |
121 | 121 |
122 net::HttpNetworkSession::Params network_session_params; | 122 net::HttpNetworkSession::Context network_session_context; |
123 network_session_params.cert_verifier = | 123 network_session_context.cert_verifier = |
124 url_request_context_->cert_verifier(); | 124 url_request_context_->cert_verifier(); |
125 network_session_params.transport_security_state = | 125 network_session_context.transport_security_state = |
126 url_request_context_->transport_security_state(); | 126 url_request_context_->transport_security_state(); |
127 network_session_params.cert_transparency_verifier = | 127 network_session_context.cert_transparency_verifier = |
128 url_request_context_->cert_transparency_verifier(); | 128 url_request_context_->cert_transparency_verifier(); |
129 network_session_params.channel_id_service = | 129 network_session_context.channel_id_service = |
130 url_request_context_->channel_id_service(); | 130 url_request_context_->channel_id_service(); |
131 network_session_params.net_log = url_request_context_->net_log(); | 131 network_session_context.net_log = url_request_context_->net_log(); |
132 network_session_params.proxy_service = | 132 network_session_context.proxy_service = |
133 url_request_context_->proxy_service(); | 133 url_request_context_->proxy_service(); |
134 network_session_params.ssl_config_service = | 134 network_session_context.ssl_config_service = |
135 url_request_context_->ssl_config_service(); | 135 url_request_context_->ssl_config_service(); |
136 network_session_params.http_auth_handler_factory = | 136 network_session_context.http_auth_handler_factory = |
137 url_request_context_->http_auth_handler_factory(); | 137 url_request_context_->http_auth_handler_factory(); |
138 network_session_params.http_server_properties = | 138 network_session_context.http_server_properties = |
139 url_request_context_->http_server_properties(); | 139 url_request_context_->http_server_properties(); |
140 network_session_params.host_resolver = | 140 network_session_context.host_resolver = |
141 url_request_context_->host_resolver(); | 141 url_request_context_->host_resolver(); |
142 network_session_params.ct_policy_enforcer = | 142 network_session_context.ct_policy_enforcer = |
143 url_request_context_->ct_policy_enforcer(); | 143 url_request_context_->ct_policy_enforcer(); |
144 | 144 |
145 base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache")); | 145 base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache")); |
146 std::unique_ptr<net::HttpCache::DefaultBackend> main_backend( | 146 std::unique_ptr<net::HttpCache::DefaultBackend> main_backend( |
147 new net::HttpCache::DefaultBackend(net::DISK_CACHE, | 147 new net::HttpCache::DefaultBackend(net::DISK_CACHE, |
148 net::CACHE_BACKEND_DEFAULT, | 148 net::CACHE_BACKEND_DEFAULT, |
149 cache_path, 0, cache_task_runner_)); | 149 cache_path, 0, cache_task_runner_)); |
150 | 150 |
151 storage_->set_http_network_session( | 151 storage_->set_http_network_session( |
152 base::MakeUnique<net::HttpNetworkSession>(network_session_params)); | 152 base::MakeUnique<net::HttpNetworkSession>( |
| 153 net::HttpNetworkSession::Params(), network_session_context)); |
153 storage_->set_http_transaction_factory(base::MakeUnique<net::HttpCache>( | 154 storage_->set_http_transaction_factory(base::MakeUnique<net::HttpCache>( |
154 storage_->http_network_session(), std::move(main_backend), | 155 storage_->http_network_session(), std::move(main_backend), |
155 true /* set_up_quic_server_info */)); | 156 true /* set_up_quic_server_info */)); |
156 | 157 |
157 std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory( | 158 std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory( |
158 new net::URLRequestJobFactoryImpl()); | 159 new net::URLRequestJobFactoryImpl()); |
159 bool set_protocol = job_factory->SetProtocolHandler( | 160 bool set_protocol = job_factory->SetProtocolHandler( |
160 "data", base::MakeUnique<net::DataProtocolHandler>()); | 161 "data", base::MakeUnique<net::DataProtocolHandler>()); |
161 DCHECK(set_protocol); | 162 DCHECK(set_protocol); |
162 | 163 |
163 storage_->set_job_factory(std::move(job_factory)); | 164 storage_->set_job_factory(std::move(job_factory)); |
164 } | 165 } |
165 | 166 |
166 return url_request_context_.get(); | 167 return url_request_context_.get(); |
167 } | 168 } |
168 | 169 |
169 scoped_refptr<base::SingleThreadTaskRunner> | 170 scoped_refptr<base::SingleThreadTaskRunner> |
170 WebViewURLRequestContextGetter::GetNetworkTaskRunner() const { | 171 WebViewURLRequestContextGetter::GetNetworkTaskRunner() const { |
171 return network_task_runner_; | 172 return network_task_runner_; |
172 } | 173 } |
173 | 174 |
174 } // namespace ios_web_view | 175 } // namespace ios_web_view |
OLD | NEW |