Re-enable HTTP/2 over NPN (for OpenSSL).

net/http/http_network_session.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/http/http_network_session.h"
 
 #include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/debug/stack_trace.h"
@@ skipping 315 matching lines @@
   if (HttpStreamFactory::spdy_enabled()) {
     *alpn_protos = next_protos_;
   } else {
     alpn_protos->clear();
   }
 }
 
 void HttpNetworkSession::GetNpnProtos(NextProtoVector* npn_protos) const {
   if (HttpStreamFactory::spdy_enabled() && params_.enable_npn) {
     *npn_protos = next_protos_;
-    DisableHTTP2(npn_protos);
   } else {
     npn_protos->clear();
   }
 }
 
 bool HttpNetworkSession::HasSpdyExclusion(
     HostPortPair host_port_pair) const {
   return params_.forced_spdy_exclusions.find(host_port_pair) !=
       params_.forced_spdy_exclusions.end();
 }
 
 ClientSocketPoolManager* HttpNetworkSession::GetSocketPoolManager(
     SocketPoolType pool_type) {
   switch (pool_type) {
     case NORMAL_SOCKET_POOL:
       return normal_socket_pool_manager_.get();
     case WEBSOCKET_SOCKET_POOL:
       return websocket_socket_pool_manager_.get();
     default:
       NOTREACHED();
       break;
   }
   return NULL;
 }
 
 }  // namespace net