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

net/socket/next_proto.h

Index: net/socket/next_proto.h
diff --git a/net/socket/next_proto.h b/net/socket/next_proto.h
index ab28a35bf387d9968b7dbfbb459667de8e42a678..797c6ae863800d95c7860b028a81350fed85cad7 100644
--- a/net/socket/next_proto.h
+++ b/net/socket/next_proto.h
@@ -5,6 +5,10 @@
 #ifndef NET_SOCKET_NEXT_PROTO_H_
 #define NET_SOCKET_NEXT_PROTO_H_
 
+#include <vector>
+
+#include "net/base/net_export.h"
+
 namespace net {
 
 // Next Protocol Negotiation (NPN), if successful, results in agreement on an
@@ -28,6 +32,19 @@ enum NextProto {
   kProtoMaximumVersion = kProtoQUIC1SPDY3,
 };
 
+// List of protocols to use for NPN, used for configuring HttpNetworkSessions.
+typedef std::vector<NextProto> NextProtoVector;
+
+// Convenience functions to create NextProtoVector.
+
+NET_EXPORT NextProtoVector NextProtosHttpOnly();
+
+// All of these also enable QUIC.
+NET_EXPORT NextProtoVector NextProtosSpdy3();
+NET_EXPORT NextProtoVector NextProtosSpdy31();
+NET_EXPORT NextProtoVector NextProtosSpdy31WithSpdy2();
+NET_EXPORT NextProtoVector NextProtosSpdy4Http2();
+
 }  // namespace net
 
 #endif  // NET_SOCKET_NEXT_PROTO_H_