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 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 max_size(0) {} | 178 max_size(0) {} |
179 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {} | 179 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {} |
180 | 180 |
181 URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams() | 181 URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams() |
182 : ignore_certificate_errors(false), | 182 : ignore_certificate_errors(false), |
183 host_mapping_rules(NULL), | 183 host_mapping_rules(NULL), |
184 testing_fixed_http_port(0), | 184 testing_fixed_http_port(0), |
185 testing_fixed_https_port(0), | 185 testing_fixed_https_port(0), |
186 next_protos(NextProtosDefaults()), | 186 next_protos(NextProtosDefaults()), |
187 use_alternate_protocols(true), | 187 use_alternate_protocols(true), |
188 enable_quic(false) { | 188 enable_quic(false), |
| 189 enable_quic_for_proxies(false) { |
189 } | 190 } |
190 | 191 |
191 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams() | 192 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams() |
192 {} | 193 {} |
193 | 194 |
194 URLRequestContextBuilder::SchemeFactory::SchemeFactory( | 195 URLRequestContextBuilder::SchemeFactory::SchemeFactory( |
195 const std::string& auth_scheme, | 196 const std::string& auth_scheme, |
196 net::HttpAuthHandlerFactory* auth_handler_factory) | 197 net::HttpAuthHandlerFactory* auth_handler_factory) |
197 : scheme(auth_scheme), factory(auth_handler_factory) { | 198 : scheme(auth_scheme), factory(auth_handler_factory) { |
198 } | 199 } |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
351 network_session_params.testing_fixed_http_port = | 352 network_session_params.testing_fixed_http_port = |
352 http_network_session_params_.testing_fixed_http_port; | 353 http_network_session_params_.testing_fixed_http_port; |
353 network_session_params.testing_fixed_https_port = | 354 network_session_params.testing_fixed_https_port = |
354 http_network_session_params_.testing_fixed_https_port; | 355 http_network_session_params_.testing_fixed_https_port; |
355 network_session_params.use_alternate_protocols = | 356 network_session_params.use_alternate_protocols = |
356 http_network_session_params_.use_alternate_protocols; | 357 http_network_session_params_.use_alternate_protocols; |
357 network_session_params.trusted_spdy_proxy = | 358 network_session_params.trusted_spdy_proxy = |
358 http_network_session_params_.trusted_spdy_proxy; | 359 http_network_session_params_.trusted_spdy_proxy; |
359 network_session_params.next_protos = http_network_session_params_.next_protos; | 360 network_session_params.next_protos = http_network_session_params_.next_protos; |
360 network_session_params.enable_quic = http_network_session_params_.enable_quic; | 361 network_session_params.enable_quic = http_network_session_params_.enable_quic; |
| 362 network_session_params.enable_quic_for_proxies = |
| 363 http_network_session_params_.enable_quic_for_proxies; |
361 network_session_params.quic_connection_options = | 364 network_session_params.quic_connection_options = |
362 http_network_session_params_.quic_connection_options; | 365 http_network_session_params_.quic_connection_options; |
363 | 366 |
364 HttpTransactionFactory* http_transaction_factory = NULL; | 367 HttpTransactionFactory* http_transaction_factory = NULL; |
365 if (http_cache_enabled_) { | 368 if (http_cache_enabled_) { |
366 network_session_params.channel_id_service = | 369 network_session_params.channel_id_service = |
367 context->channel_id_service(); | 370 context->channel_id_service(); |
368 HttpCache::BackendFactory* http_cache_backend = NULL; | 371 HttpCache::BackendFactory* http_cache_backend = NULL; |
369 if (http_cache_params_.type == HttpCacheParams::DISK) { | 372 if (http_cache_params_.type == HttpCacheParams::DISK) { |
370 http_cache_backend = new HttpCache::DefaultBackend( | 373 http_cache_backend = new HttpCache::DefaultBackend( |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
410 #endif // !defined(DISABLE_FTP_SUPPORT) | 413 #endif // !defined(DISABLE_FTP_SUPPORT) |
411 | 414 |
412 storage->set_job_factory(job_factory); | 415 storage->set_job_factory(job_factory); |
413 | 416 |
414 // TODO(willchan): Support sdch. | 417 // TODO(willchan): Support sdch. |
415 | 418 |
416 return context; | 419 return context; |
417 } | 420 } |
418 | 421 |
419 } // namespace net | 422 } // namespace net |
OLD | NEW |