| 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 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 network_session_params.quic_close_sessions_on_ip_change = | 425 network_session_params.quic_close_sessions_on_ip_change = |
| 426 http_network_session_params_.quic_close_sessions_on_ip_change; | 426 http_network_session_params_.quic_close_sessions_on_ip_change; |
| 427 network_session_params.quic_migrate_sessions_on_network_change = | 427 network_session_params.quic_migrate_sessions_on_network_change = |
| 428 http_network_session_params_.quic_migrate_sessions_on_network_change; | 428 http_network_session_params_.quic_migrate_sessions_on_network_change; |
| 429 network_session_params.quic_user_agent_id = | 429 network_session_params.quic_user_agent_id = |
| 430 http_network_session_params_.quic_user_agent_id; | 430 http_network_session_params_.quic_user_agent_id; |
| 431 network_session_params.quic_prefer_aes = | 431 network_session_params.quic_prefer_aes = |
| 432 http_network_session_params_.quic_prefer_aes; | 432 http_network_session_params_.quic_prefer_aes; |
| 433 network_session_params.quic_migrate_sessions_early = | 433 network_session_params.quic_migrate_sessions_early = |
| 434 http_network_session_params_.quic_migrate_sessions_early; | 434 http_network_session_params_.quic_migrate_sessions_early; |
| 435 network_session_params.quic_disable_bidirectional_streams = |
| 436 http_network_session_params_.quic_disable_bidirectional_streams; |
| 435 if (proxy_delegate_) { | 437 if (proxy_delegate_) { |
| 436 network_session_params.proxy_delegate = proxy_delegate_.get(); | 438 network_session_params.proxy_delegate = proxy_delegate_.get(); |
| 437 storage->set_proxy_delegate(std::move(proxy_delegate_)); | 439 storage->set_proxy_delegate(std::move(proxy_delegate_)); |
| 438 } | 440 } |
| 439 | 441 |
| 440 storage->set_http_network_session( | 442 storage->set_http_network_session( |
| 441 make_scoped_ptr(new HttpNetworkSession(network_session_params))); | 443 make_scoped_ptr(new HttpNetworkSession(network_session_params))); |
| 442 | 444 |
| 443 scoped_ptr<HttpTransactionFactory> http_transaction_factory; | 445 scoped_ptr<HttpTransactionFactory> http_transaction_factory; |
| 444 if (http_cache_enabled_) { | 446 if (http_cache_enabled_) { |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 } | 508 } |
| 507 url_request_interceptors_.clear(); | 509 url_request_interceptors_.clear(); |
| 508 } | 510 } |
| 509 storage->set_job_factory(std::move(top_job_factory)); | 511 storage->set_job_factory(std::move(top_job_factory)); |
| 510 // TODO(willchan): Support sdch. | 512 // TODO(willchan): Support sdch. |
| 511 | 513 |
| 512 return std::move(context); | 514 return std::move(context); |
| 513 } | 515 } |
| 514 | 516 |
| 515 } // namespace net | 517 } // namespace net |
| OLD | NEW |