Remove HttpStreamFactory::spdy_enabled_ static member and accessors.

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/atomic_sequence_num.h"
 #include "base/compiler_specific.h"
@@ skipping 348 matching lines @@
   spdy_session_pool_.CloseCurrentIdleSessions();
 }
 
 bool HttpNetworkSession::IsProtocolEnabled(AlternateProtocol protocol) const {
   DCHECK(IsAlternateProtocolValid(protocol));
   return enabled_protocols_[
       protocol - ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION];
 }
 
 void HttpNetworkSession::GetAlpnProtos(NextProtoVector* alpn_protos) const {
-  if (HttpStreamFactory::spdy_enabled()) {
-    *alpn_protos = next_protos_;
-  } else {
-    // HttpStreamFactory::spdy_enabled() only affects SPDY/3.1,
-    // but not other ALPN protocols.
-    alpn_protos->clear();
-    for (auto proto : next_protos_) {
-      if (proto != kProtoSPDY31)
-        alpn_protos->push_back(proto);
-    }
-  }
+  *alpn_protos = next_protos_;
 }
 
 void HttpNetworkSession::GetNpnProtos(NextProtoVector* npn_protos) const {
   npn_protos->clear();
 }
 
 void HttpNetworkSession::GetSSLConfig(const HttpRequestInfo& request,
                                       SSLConfig* server_config,
                                       SSLConfig* proxy_config) const {
   ssl_config_service_->GetSSLConfig(server_config);
@@ skipping 27 matching lines @@
     case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE:
       break;
     case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_MODERATE:
     case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL:
       CloseIdleConnections();
       break;
   }
 }
 
 }  // namespace net