| 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/url_request/url_request_context_builder.h" | 5 #include "net/url_request/url_request_context_builder.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 void URLRequestContextBuilder::SetHttpNetworkSessionComponents( | 216 void URLRequestContextBuilder::SetHttpNetworkSessionComponents( |
| 217 const URLRequestContext* context, | 217 const URLRequestContext* context, |
| 218 HttpNetworkSession::Params* params) { | 218 HttpNetworkSession::Params* params) { |
| 219 params->host_resolver = context->host_resolver(); | 219 params->host_resolver = context->host_resolver(); |
| 220 params->cert_verifier = context->cert_verifier(); | 220 params->cert_verifier = context->cert_verifier(); |
| 221 params->transport_security_state = context->transport_security_state(); | 221 params->transport_security_state = context->transport_security_state(); |
| 222 params->cert_transparency_verifier = context->cert_transparency_verifier(); | 222 params->cert_transparency_verifier = context->cert_transparency_verifier(); |
| 223 params->proxy_service = context->proxy_service(); | 223 params->proxy_service = context->proxy_service(); |
| 224 params->ssl_config_service = context->ssl_config_service(); | 224 params->ssl_config_service = context->ssl_config_service(); |
| 225 params->http_auth_handler_factory = context->http_auth_handler_factory(); | 225 params->http_auth_handler_factory = context->http_auth_handler_factory(); |
| 226 params->network_delegate = context->network_delegate(); | |
| 227 params->http_server_properties = context->http_server_properties(); | 226 params->http_server_properties = context->http_server_properties(); |
| 228 params->net_log = context->net_log(); | 227 params->net_log = context->net_log(); |
| 229 params->channel_id_service = context->channel_id_service(); | 228 params->channel_id_service = context->channel_id_service(); |
| 230 } | 229 } |
| 231 | 230 |
| 232 void URLRequestContextBuilder::EnableHttpCache(const HttpCacheParams& params) { | 231 void URLRequestContextBuilder::EnableHttpCache(const HttpCacheParams& params) { |
| 233 http_cache_enabled_ = true; | 232 http_cache_enabled_ = true; |
| 234 http_cache_params_ = params; | 233 http_cache_params_ = params; |
| 235 } | 234 } |
| 236 | 235 |
| (...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 } | 505 } |
| 507 url_request_interceptors_.clear(); | 506 url_request_interceptors_.clear(); |
| 508 } | 507 } |
| 509 storage->set_job_factory(std::move(top_job_factory)); | 508 storage->set_job_factory(std::move(top_job_factory)); |
| 510 // TODO(willchan): Support sdch. | 509 // TODO(willchan): Support sdch. |
| 511 | 510 |
| 512 return std::move(context); | 511 return std::move(context); |
| 513 } | 512 } |
| 514 | 513 |
| 515 } // namespace net | 514 } // namespace net |
| OLD | NEW |