Remove HttpStreamFactory's NPN/SPDY globals, except for spdy_enabled.

jingle/glue/proxy_resolving_client_socket.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 "jingle/glue/proxy_resolving_client_socket.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
@@ skipping 52 matching lines @@
   session_params.http_auth_handler_factory =
       request_context->http_auth_handler_factory();
   session_params.network_delegate = request_context->network_delegate();
   session_params.http_server_properties =
       request_context->http_server_properties();
   session_params.net_log = request_context->net_log();
 
   const net::HttpNetworkSession::Params* reference_params =
       request_context->GetNetworkSessionParams();
   if (reference_params) {
+    // TODO(mmenke):  Just copying specific parameters seems highly regression
+    // prone.  Should have a better way to do this.
     session_params.host_mapping_rules = reference_params->host_mapping_rules;
     session_params.ignore_certificate_errors =
         reference_params->ignore_certificate_errors;
     session_params.http_pipelining_enabled =
         reference_params->http_pipelining_enabled;
     session_params.testing_fixed_http_port =
         reference_params->testing_fixed_http_port;
     session_params.testing_fixed_https_port =
         reference_params->testing_fixed_https_port;
+    session_params.next_protos = reference_params->next_protos;
     session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy;
+    session_params.force_spdy_over_ssl = reference_params->force_spdy_over_ssl;
+    session_params.force_spdy_always = reference_params->force_spdy_always;
+    session_params.forced_spdy_exclusions =
+        reference_params->forced_spdy_exclusions;
+    session_params.use_alternate_protocols =
+        reference_params->use_alternate_protocols;
   }
 
   network_session_ = new net::HttpNetworkSession(session_params);
 }
 
 ProxyResolvingClientSocket::~ProxyResolvingClientSocket() {
   Disconnect();
 }
 
 int ProxyResolvingClientSocket::Read(net::IOBuffer* buf, int buf_len,
@@ skipping 296 matching lines @@
   return false;
 }
 
 void ProxyResolvingClientSocket::CloseTransportSocket() {
   if (transport_.get() && transport_->socket())
     transport_->socket()->Disconnect();
   transport_.reset();
 }
 
 }  // namespace jingle_glue