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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 URLRequestContextBuilder::HttpCacheParams::HttpCacheParams() | 169 URLRequestContextBuilder::HttpCacheParams::HttpCacheParams() |
170 : type(IN_MEMORY), | 170 : type(IN_MEMORY), |
171 max_size(0) {} | 171 max_size(0) {} |
172 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {} | 172 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {} |
173 | 173 |
174 URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams() | 174 URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams() |
175 : ignore_certificate_errors(false), | 175 : ignore_certificate_errors(false), |
176 host_mapping_rules(NULL), | 176 host_mapping_rules(NULL), |
177 testing_fixed_http_port(0), | 177 testing_fixed_http_port(0), |
178 testing_fixed_https_port(0), | 178 testing_fixed_https_port(0), |
179 trusted_spdy_proxy() {} | 179 next_protos(NextProtosDefaults()), |
| 180 use_alternate_protocols(true) { |
| 181 } |
180 | 182 |
181 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams() | 183 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams() |
182 {} | 184 {} |
183 | 185 |
184 URLRequestContextBuilder::SchemeFactory::SchemeFactory( | 186 URLRequestContextBuilder::SchemeFactory::SchemeFactory( |
185 const std::string& auth_scheme, | 187 const std::string& auth_scheme, |
186 net::HttpAuthHandlerFactory* auth_handler_factory) | 188 net::HttpAuthHandlerFactory* auth_handler_factory) |
187 : scheme(auth_scheme), factory(auth_handler_factory) { | 189 : scheme(auth_scheme), factory(auth_handler_factory) { |
188 } | 190 } |
189 | 191 |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 context->transport_security_state(); | 272 context->transport_security_state(); |
271 network_session_params.proxy_service = context->proxy_service(); | 273 network_session_params.proxy_service = context->proxy_service(); |
272 network_session_params.ssl_config_service = | 274 network_session_params.ssl_config_service = |
273 context->ssl_config_service(); | 275 context->ssl_config_service(); |
274 network_session_params.http_auth_handler_factory = | 276 network_session_params.http_auth_handler_factory = |
275 context->http_auth_handler_factory(); | 277 context->http_auth_handler_factory(); |
276 network_session_params.network_delegate = network_delegate; | 278 network_session_params.network_delegate = network_delegate; |
277 network_session_params.http_server_properties = | 279 network_session_params.http_server_properties = |
278 context->http_server_properties(); | 280 context->http_server_properties(); |
279 network_session_params.net_log = context->net_log(); | 281 network_session_params.net_log = context->net_log(); |
| 282 |
280 network_session_params.ignore_certificate_errors = | 283 network_session_params.ignore_certificate_errors = |
281 http_network_session_params_.ignore_certificate_errors; | 284 http_network_session_params_.ignore_certificate_errors; |
282 network_session_params.host_mapping_rules = | 285 network_session_params.host_mapping_rules = |
283 http_network_session_params_.host_mapping_rules; | 286 http_network_session_params_.host_mapping_rules; |
284 network_session_params.testing_fixed_http_port = | 287 network_session_params.testing_fixed_http_port = |
285 http_network_session_params_.testing_fixed_http_port; | 288 http_network_session_params_.testing_fixed_http_port; |
286 network_session_params.testing_fixed_https_port = | 289 network_session_params.testing_fixed_https_port = |
287 http_network_session_params_.testing_fixed_https_port; | 290 http_network_session_params_.testing_fixed_https_port; |
| 291 network_session_params.use_alternate_protocols = |
| 292 http_network_session_params_.use_alternate_protocols; |
288 network_session_params.trusted_spdy_proxy = | 293 network_session_params.trusted_spdy_proxy = |
289 http_network_session_params_.trusted_spdy_proxy; | 294 http_network_session_params_.trusted_spdy_proxy; |
| 295 network_session_params.next_protos = http_network_session_params_.next_protos; |
290 | 296 |
291 HttpTransactionFactory* http_transaction_factory = NULL; | 297 HttpTransactionFactory* http_transaction_factory = NULL; |
292 if (http_cache_enabled_) { | 298 if (http_cache_enabled_) { |
293 network_session_params.server_bound_cert_service = | 299 network_session_params.server_bound_cert_service = |
294 context->server_bound_cert_service(); | 300 context->server_bound_cert_service(); |
295 HttpCache::BackendFactory* http_cache_backend = NULL; | 301 HttpCache::BackendFactory* http_cache_backend = NULL; |
296 if (http_cache_params_.type == HttpCacheParams::DISK) { | 302 if (http_cache_params_.type == HttpCacheParams::DISK) { |
297 http_cache_backend = new HttpCache::DefaultBackend( | 303 http_cache_backend = new HttpCache::DefaultBackend( |
298 DISK_CACHE, | 304 DISK_CACHE, |
299 net::CACHE_BACKEND_DEFAULT, | 305 net::CACHE_BACKEND_DEFAULT, |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 #endif // !defined(DISABLE_FTP_SUPPORT) | 343 #endif // !defined(DISABLE_FTP_SUPPORT) |
338 | 344 |
339 storage->set_job_factory(job_factory); | 345 storage->set_job_factory(job_factory); |
340 | 346 |
341 // TODO(willchan): Support sdch. | 347 // TODO(willchan): Support sdch. |
342 | 348 |
343 return context; | 349 return context; |
344 } | 350 } |
345 | 351 |
346 } // namespace net | 352 } // namespace net |
OLD | NEW |