OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "content/shell/browser/shell_url_request_context_getter.h" | 5 #include "content/shell/browser/shell_url_request_context_getter.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 new net::HttpCache::DefaultBackend( | 166 new net::HttpCache::DefaultBackend( |
167 net::DISK_CACHE, | 167 net::DISK_CACHE, |
168 #if defined(OS_ANDROID) | 168 #if defined(OS_ANDROID) |
169 // TODO(rdsmith): Remove when default backend for Android is | 169 // TODO(rdsmith): Remove when default backend for Android is |
170 // changed to simple cache. | 170 // changed to simple cache. |
171 net::CACHE_BACKEND_SIMPLE, | 171 net::CACHE_BACKEND_SIMPLE, |
172 #else | 172 #else |
173 net::CACHE_BACKEND_DEFAULT, | 173 net::CACHE_BACKEND_DEFAULT, |
174 #endif | 174 #endif |
175 cache_path, 0, | 175 cache_path, 0, |
176 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE))); | 176 BrowserThread::GetTaskRunnerForThread(BrowserThread::CACHE))); |
177 | 177 |
178 net::HttpNetworkSession::Params network_session_params; | 178 net::HttpNetworkSession::Params network_session_params; |
179 network_session_params.cert_verifier = | 179 network_session_params.cert_verifier = |
180 url_request_context_->cert_verifier(); | 180 url_request_context_->cert_verifier(); |
181 network_session_params.transport_security_state = | 181 network_session_params.transport_security_state = |
182 url_request_context_->transport_security_state(); | 182 url_request_context_->transport_security_state(); |
183 network_session_params.cert_transparency_verifier = | 183 network_session_params.cert_transparency_verifier = |
184 url_request_context_->cert_transparency_verifier(); | 184 url_request_context_->cert_transparency_verifier(); |
185 network_session_params.ct_policy_enforcer = | 185 network_session_params.ct_policy_enforcer = |
186 url_request_context_->ct_policy_enforcer(); | 186 url_request_context_->ct_policy_enforcer(); |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
259 request_interceptors_.weak_clear(); | 259 request_interceptors_.weak_clear(); |
260 | 260 |
261 storage_->set_job_factory(std::move(top_job_factory)); | 261 storage_->set_job_factory(std::move(top_job_factory)); |
262 } | 262 } |
263 | 263 |
264 return url_request_context_.get(); | 264 return url_request_context_.get(); |
265 } | 265 } |
266 | 266 |
267 scoped_refptr<base::SingleThreadTaskRunner> | 267 scoped_refptr<base::SingleThreadTaskRunner> |
268 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { | 268 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { |
269 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); | 269 return BrowserThread::GetTaskRunnerForThread(BrowserThread::IO); |
270 } | 270 } |
271 | 271 |
272 net::HostResolver* ShellURLRequestContextGetter::host_resolver() { | 272 net::HostResolver* ShellURLRequestContextGetter::host_resolver() { |
273 return url_request_context_->host_resolver(); | 273 return url_request_context_->host_resolver(); |
274 } | 274 } |
275 | 275 |
276 } // namespace content | 276 } // namespace content |
OLD | NEW |