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

Unified Diff: net/url_request/url_request_context_builder.cc

Issue 302893003: Enable SPDY 3.1 and 3.0 in UrlRequestContextBuilder by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: oops Created 6 years, 7 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/url_request/url_request_context_builder.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7b2c9534bb2e1cb6377bc791f80f338b62dfbb74..5fb588038b361d444fdf0d54b9b203efab00d566 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -176,7 +176,13 @@ URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams()
host_mapping_rules(NULL),
testing_fixed_http_port(0),
testing_fixed_https_port(0),
- trusted_spdy_proxy() {}
+ use_alternate_protocols(true) {
+ // By default, support SPDY and enable NPN. These are different defaults from
+ // HttpNetworkSession.
+ next_protos.push_back(kProtoHTTP11);
+ next_protos.push_back(kProtoSPDY3);
+ next_protos.push_back(kProtoSPDY31);
Ryan Hamilton 2014/05/29 19:54:38 So at some point, we're going to turn QUIC on by d
+}
URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
{}
@@ -277,6 +283,7 @@ URLRequestContext* URLRequestContextBuilder::Build() {
network_session_params.http_server_properties =
context->http_server_properties();
network_session_params.net_log = context->net_log();
+
network_session_params.ignore_certificate_errors =
http_network_session_params_.ignore_certificate_errors;
network_session_params.host_mapping_rules =
@@ -285,8 +292,11 @@ URLRequestContext* URLRequestContextBuilder::Build() {
http_network_session_params_.testing_fixed_http_port;
network_session_params.testing_fixed_https_port =
http_network_session_params_.testing_fixed_https_port;
+ network_session_params.use_alternate_protocols =
+ http_network_session_params_.use_alternate_protocols;
network_session_params.trusted_spdy_proxy =
http_network_session_params_.trusted_spdy_proxy;
+ network_session_params.next_protos = http_network_session_params_.next_protos;
HttpTransactionFactory* http_transaction_factory = NULL;
if (http_cache_enabled_) {
« 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