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 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
382 network_session_params.testing_fixed_http_port = | 382 network_session_params.testing_fixed_http_port = |
383 http_network_session_params_.testing_fixed_http_port; | 383 http_network_session_params_.testing_fixed_http_port; |
384 network_session_params.testing_fixed_https_port = | 384 network_session_params.testing_fixed_https_port = |
385 http_network_session_params_.testing_fixed_https_port; | 385 http_network_session_params_.testing_fixed_https_port; |
386 network_session_params.use_alternative_services = | 386 network_session_params.use_alternative_services = |
387 http_network_session_params_.use_alternative_services; | 387 http_network_session_params_.use_alternative_services; |
388 network_session_params.trusted_spdy_proxy = | 388 network_session_params.trusted_spdy_proxy = |
389 http_network_session_params_.trusted_spdy_proxy; | 389 http_network_session_params_.trusted_spdy_proxy; |
390 network_session_params.next_protos = http_network_session_params_.next_protos; | 390 network_session_params.next_protos = http_network_session_params_.next_protos; |
391 network_session_params.enable_quic = http_network_session_params_.enable_quic; | 391 network_session_params.enable_quic = http_network_session_params_.enable_quic; |
| 392 network_session_params.quic_store_server_configs_in_properties = |
| 393 http_network_session_params_.quic_store_server_configs_in_properties; |
| 394 network_session_params.quic_delay_tcp_race = |
| 395 http_network_session_params_.quic_delay_tcp_race; |
392 network_session_params.quic_connection_options = | 396 network_session_params.quic_connection_options = |
393 http_network_session_params_.quic_connection_options; | 397 http_network_session_params_.quic_connection_options; |
394 | 398 |
395 storage->set_http_network_session( | 399 storage->set_http_network_session( |
396 make_scoped_ptr(new HttpNetworkSession(network_session_params))); | 400 make_scoped_ptr(new HttpNetworkSession(network_session_params))); |
397 | 401 |
398 scoped_ptr<HttpTransactionFactory> http_transaction_factory; | 402 scoped_ptr<HttpTransactionFactory> http_transaction_factory; |
399 if (http_cache_enabled_) { | 403 if (http_cache_enabled_) { |
400 scoped_ptr<HttpCache::BackendFactory> http_cache_backend; | 404 scoped_ptr<HttpCache::BackendFactory> http_cache_backend; |
401 if (http_cache_params_.type != HttpCacheParams::IN_MEMORY) { | 405 if (http_cache_params_.type != HttpCacheParams::IN_MEMORY) { |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
454 } | 458 } |
455 url_request_interceptors_.weak_clear(); | 459 url_request_interceptors_.weak_clear(); |
456 } | 460 } |
457 storage->set_job_factory(top_job_factory.Pass()); | 461 storage->set_job_factory(top_job_factory.Pass()); |
458 // TODO(willchan): Support sdch. | 462 // TODO(willchan): Support sdch. |
459 | 463 |
460 return context.Pass(); | 464 return context.Pass(); |
461 } | 465 } |
462 | 466 |
463 } // namespace net | 467 } // namespace net |
OLD | NEW |