| Index: net/url_request/url_request_context_builder.cc
|
| diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
|
| index bc12e0911017580de636ed454ae5a1760ca72038..8311c4c9ec070ce9eead7ebab8d6bb01b33f09e2 100644
|
| --- a/net/url_request/url_request_context_builder.cc
|
| +++ b/net/url_request/url_request_context_builder.cc
|
| @@ -417,20 +417,24 @@ scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
|
| network_session_params.quic_close_sessions_on_ip_change =
|
| http_network_session_params_.quic_close_sessions_on_ip_change;
|
| network_session_params.quic_migrate_sessions_on_network_change =
|
| http_network_session_params_.quic_migrate_sessions_on_network_change;
|
| network_session_params.quic_user_agent_id =
|
| http_network_session_params_.quic_user_agent_id;
|
| network_session_params.quic_prefer_aes =
|
| http_network_session_params_.quic_prefer_aes;
|
| network_session_params.quic_migrate_sessions_early =
|
| http_network_session_params_.quic_migrate_sessions_early;
|
| + if (proxy_delegate_) {
|
| + network_session_params.proxy_delegate = proxy_delegate_.get();
|
| + storage->set_proxy_delegate(std::move(proxy_delegate_));
|
| + }
|
|
|
| storage->set_http_network_session(
|
| make_scoped_ptr(new HttpNetworkSession(network_session_params)));
|
|
|
| scoped_ptr<HttpTransactionFactory> http_transaction_factory;
|
| if (http_cache_enabled_) {
|
| scoped_ptr<HttpCache::BackendFactory> http_cache_backend;
|
| if (http_cache_params_.type != HttpCacheParams::IN_MEMORY) {
|
| BackendType backend_type =
|
| http_cache_params_.type == HttpCacheParams::DISK
|
|
|