Enable SPDY 3.1 and 3.0 in UrlRequestContextBuilder by default

net/url_request/url_request_context_builder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/url_request/url_request_context_builder.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 158 matching lines @@
 URLRequestContextBuilder::HttpCacheParams::HttpCacheParams()
     : type(IN_MEMORY),
       max_size(0) {}
 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {}
 
 URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams()
     : ignore_certificate_errors(false),
       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 default. I'm sure I won't
remember to do it here :> In the least, I'd be inclined to use one of the
existing NextProtos methods from next_protos.h. But I think we really should
work towards having the right defaults. So I think your suggestion of doing this
in HttpNetworkSession::Params is the right way forward. I you want to land this
while you work on that, I'm fine with that approach, but I wouldn't want to see
this code exist as anything other than a bandaid. What do you think?

+}
 
 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
 {}
 
 URLRequestContextBuilder::SchemeFactory::SchemeFactory(
     const std::string& auth_scheme,
     net::HttpAuthHandlerFactory* auth_handler_factory)
     : scheme(auth_scheme), factory(auth_handler_factory) {
 }
 
@@ skipping 80 matching lines @@
       context->transport_security_state();
   network_session_params.proxy_service = context->proxy_service();
   network_session_params.ssl_config_service =
       context->ssl_config_service();
   network_session_params.http_auth_handler_factory =
       context->http_auth_handler_factory();
   network_session_params.network_delegate = network_delegate;
   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 =
       http_network_session_params_.host_mapping_rules;
   network_session_params.testing_fixed_http_port =
       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_) {
     network_session_params.server_bound_cert_service =
         context->server_bound_cert_service();
     HttpCache::BackendFactory* http_cache_backend = NULL;
     if (http_cache_params_.type == HttpCacheParams::DISK) {
       http_cache_backend = new HttpCache::DefaultBackend(
           DISK_CACHE,
           net::CACHE_BACKEND_DEFAULT,
@@ skipping 37 matching lines @@
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
   storage->set_job_factory(job_factory);
 
   // TODO(willchan): Support sdch.
 
   return context;
 }
 
 }  // namespace net