Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Side by Side Diff: net/url_request/url_request_context_builder.cc

Issue 1505983003: QUIC - cronet - added idle_connection_timeout_seconds and disable experiments (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@enable_preconnect_exp
Patch Set: Deleted PreConnect option Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/url_request/url_request_context_builder.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 10 matching lines...) Expand all
21 #include "net/cookies/cookie_monster.h" 21 #include "net/cookies/cookie_monster.h"
22 #include "net/dns/host_resolver.h" 22 #include "net/dns/host_resolver.h"
23 #include "net/ftp/ftp_network_layer.h" 23 #include "net/ftp/ftp_network_layer.h"
24 #include "net/http/http_auth_handler_factory.h" 24 #include "net/http/http_auth_handler_factory.h"
25 #include "net/http/http_cache.h" 25 #include "net/http/http_cache.h"
26 #include "net/http/http_network_layer.h" 26 #include "net/http/http_network_layer.h"
27 #include "net/http/http_server_properties_impl.h" 27 #include "net/http/http_server_properties_impl.h"
28 #include "net/http/http_server_properties_manager.h" 28 #include "net/http/http_server_properties_manager.h"
29 #include "net/http/transport_security_persister.h" 29 #include "net/http/transport_security_persister.h"
30 #include "net/http/transport_security_state.h" 30 #include "net/http/transport_security_state.h"
31 #include "net/quic/quic_stream_factory.h"
31 #include "net/ssl/channel_id_service.h" 32 #include "net/ssl/channel_id_service.h"
32 #include "net/ssl/default_channel_id_store.h" 33 #include "net/ssl/default_channel_id_store.h"
33 #include "net/ssl/ssl_config_service_defaults.h" 34 #include "net/ssl/ssl_config_service_defaults.h"
34 #include "net/url_request/data_protocol_handler.h" 35 #include "net/url_request/data_protocol_handler.h"
35 #include "net/url_request/static_http_user_agent_settings.h" 36 #include "net/url_request/static_http_user_agent_settings.h"
36 #include "net/url_request/url_request_backoff_manager.h" 37 #include "net/url_request/url_request_backoff_manager.h"
37 #include "net/url_request/url_request_context.h" 38 #include "net/url_request/url_request_context.h"
38 #include "net/url_request/url_request_context_storage.h" 39 #include "net/url_request/url_request_context_storage.h"
39 #include "net/url_request/url_request_intercepting_job_factory.h" 40 #include "net/url_request/url_request_intercepting_job_factory.h"
40 #include "net/url_request/url_request_interceptor.h" 41 #include "net/url_request/url_request_interceptor.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 : ignore_certificate_errors(false), 175 : ignore_certificate_errors(false),
175 host_mapping_rules(NULL), 176 host_mapping_rules(NULL),
176 testing_fixed_http_port(0), 177 testing_fixed_http_port(0),
177 testing_fixed_https_port(0), 178 testing_fixed_https_port(0),
178 next_protos(NextProtosDefaults()), 179 next_protos(NextProtosDefaults()),
179 use_alternative_services(true), 180 use_alternative_services(true),
180 enable_quic(false), 181 enable_quic(false),
181 quic_store_server_configs_in_properties(false), 182 quic_store_server_configs_in_properties(false),
182 quic_delay_tcp_race(false), 183 quic_delay_tcp_race(false),
183 quic_max_number_of_lossy_connections(0), 184 quic_max_number_of_lossy_connections(0),
184 quic_packet_loss_threshold(1.0f) {} 185 quic_packet_loss_threshold(1.0f),
186 quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds) {}
185 187
186 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams() 188 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
187 {} 189 {}
188 190
189 URLRequestContextBuilder::URLRequestContextBuilder() 191 URLRequestContextBuilder::URLRequestContextBuilder()
190 : data_enabled_(false), 192 : data_enabled_(false),
191 #if !defined(DISABLE_FILE_SUPPORT) 193 #if !defined(DISABLE_FILE_SUPPORT)
192 file_enabled_(false), 194 file_enabled_(false),
193 #endif 195 #endif
194 #if !defined(DISABLE_FTP_SUPPORT) 196 #if !defined(DISABLE_FTP_SUPPORT)
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 network_session_params.next_protos = http_network_session_params_.next_protos; 390 network_session_params.next_protos = http_network_session_params_.next_protos;
389 network_session_params.enable_quic = http_network_session_params_.enable_quic; 391 network_session_params.enable_quic = http_network_session_params_.enable_quic;
390 network_session_params.quic_store_server_configs_in_properties = 392 network_session_params.quic_store_server_configs_in_properties =
391 http_network_session_params_.quic_store_server_configs_in_properties; 393 http_network_session_params_.quic_store_server_configs_in_properties;
392 network_session_params.quic_delay_tcp_race = 394 network_session_params.quic_delay_tcp_race =
393 http_network_session_params_.quic_delay_tcp_race; 395 http_network_session_params_.quic_delay_tcp_race;
394 network_session_params.quic_max_number_of_lossy_connections = 396 network_session_params.quic_max_number_of_lossy_connections =
395 http_network_session_params_.quic_max_number_of_lossy_connections; 397 http_network_session_params_.quic_max_number_of_lossy_connections;
396 network_session_params.quic_packet_loss_threshold = 398 network_session_params.quic_packet_loss_threshold =
397 http_network_session_params_.quic_packet_loss_threshold; 399 http_network_session_params_.quic_packet_loss_threshold;
400 network_session_params.quic_idle_connection_timeout_seconds =
401 http_network_session_params_.quic_idle_connection_timeout_seconds;
398 network_session_params.quic_connection_options = 402 network_session_params.quic_connection_options =
399 http_network_session_params_.quic_connection_options; 403 http_network_session_params_.quic_connection_options;
400 404
401 storage->set_http_network_session( 405 storage->set_http_network_session(
402 make_scoped_ptr(new HttpNetworkSession(network_session_params))); 406 make_scoped_ptr(new HttpNetworkSession(network_session_params)));
403 407
404 scoped_ptr<HttpTransactionFactory> http_transaction_factory; 408 scoped_ptr<HttpTransactionFactory> http_transaction_factory;
405 if (http_cache_enabled_) { 409 if (http_cache_enabled_) {
406 scoped_ptr<HttpCache::BackendFactory> http_cache_backend; 410 scoped_ptr<HttpCache::BackendFactory> http_cache_backend;
407 if (http_cache_params_.type != HttpCacheParams::IN_MEMORY) { 411 if (http_cache_params_.type != HttpCacheParams::IN_MEMORY) {
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 } 464 }
461 url_request_interceptors_.weak_clear(); 465 url_request_interceptors_.weak_clear();
462 } 466 }
463 storage->set_job_factory(top_job_factory.Pass()); 467 storage->set_job_factory(top_job_factory.Pass());
464 // TODO(willchan): Support sdch. 468 // TODO(willchan): Support sdch.
465 469
466 return context.Pass(); 470 return context.Pass();
467 } 471 }
468 472
469 } // namespace net 473 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_context_builder.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698