| 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 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 417 network_session_params.quic_close_sessions_on_ip_change = | 417 network_session_params.quic_close_sessions_on_ip_change = |
| 418 http_network_session_params_.quic_close_sessions_on_ip_change; | 418 http_network_session_params_.quic_close_sessions_on_ip_change; |
| 419 network_session_params.quic_migrate_sessions_on_network_change = | 419 network_session_params.quic_migrate_sessions_on_network_change = |
| 420 http_network_session_params_.quic_migrate_sessions_on_network_change; | 420 http_network_session_params_.quic_migrate_sessions_on_network_change; |
| 421 network_session_params.quic_user_agent_id = | 421 network_session_params.quic_user_agent_id = |
| 422 http_network_session_params_.quic_user_agent_id; | 422 http_network_session_params_.quic_user_agent_id; |
| 423 network_session_params.quic_prefer_aes = | 423 network_session_params.quic_prefer_aes = |
| 424 http_network_session_params_.quic_prefer_aes; | 424 http_network_session_params_.quic_prefer_aes; |
| 425 network_session_params.quic_migrate_sessions_early = | 425 network_session_params.quic_migrate_sessions_early = |
| 426 http_network_session_params_.quic_migrate_sessions_early; | 426 http_network_session_params_.quic_migrate_sessions_early; |
| 427 if (proxy_delegate_) { |
| 428 network_session_params.proxy_delegate = proxy_delegate_.get(); |
| 429 storage->set_proxy_delegate(std::move(proxy_delegate_)); |
| 430 } |
| 427 | 431 |
| 428 storage->set_http_network_session( | 432 storage->set_http_network_session( |
| 429 make_scoped_ptr(new HttpNetworkSession(network_session_params))); | 433 make_scoped_ptr(new HttpNetworkSession(network_session_params))); |
| 430 | 434 |
| 431 scoped_ptr<HttpTransactionFactory> http_transaction_factory; | 435 scoped_ptr<HttpTransactionFactory> http_transaction_factory; |
| 432 if (http_cache_enabled_) { | 436 if (http_cache_enabled_) { |
| 433 scoped_ptr<HttpCache::BackendFactory> http_cache_backend; | 437 scoped_ptr<HttpCache::BackendFactory> http_cache_backend; |
| 434 if (http_cache_params_.type != HttpCacheParams::IN_MEMORY) { | 438 if (http_cache_params_.type != HttpCacheParams::IN_MEMORY) { |
| 435 BackendType backend_type = | 439 BackendType backend_type = |
| 436 http_cache_params_.type == HttpCacheParams::DISK | 440 http_cache_params_.type == HttpCacheParams::DISK |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 486 } | 490 } |
| 487 url_request_interceptors_.clear(); | 491 url_request_interceptors_.clear(); |
| 488 } | 492 } |
| 489 storage->set_job_factory(std::move(top_job_factory)); | 493 storage->set_job_factory(std::move(top_job_factory)); |
| 490 // TODO(willchan): Support sdch. | 494 // TODO(willchan): Support sdch. |
| 491 | 495 |
| 492 return std::move(context); | 496 return std::move(context); |
| 493 } | 497 } |
| 494 | 498 |
| 495 } // namespace net | 499 } // namespace net |
| OLD | NEW |