Independently enable SPDY versions from field trial.

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 22cfbd1611faa600dab79f976e2361e07e2652c1..b4b1d720ab62b9c4e84b6a600a9d96ca459922dc 100644
--- a/net/socket/next_proto.h
+++ b/net/socket/next_proto.h
@@ -47,19 +47,16 @@ typedef std::vector<NextProto> NextProtoVector;
 
 // Convenience functions to create NextProtoVector.
 
-NET_EXPORT NextProtoVector NextProtosHttpOnly();
-
-// Default values, which are subject to change over time.  Currently just
-// SPDY 3 and 3.1.
+// Default values, which are subject to change over time.
 NET_EXPORT NextProtoVector NextProtosDefaults();
 
+// Enable SPDY/3.1 and QUIC, but not HTTP/2.
+NET_EXPORT NextProtoVector NextProtosSpdy31();
+
+// Control SPDY/3.1 and HTTP/2 separately.
 NET_EXPORT NextProtoVector NextProtosWithSpdyAndQuic(bool spdy_enabled,
                                                      bool quic_enabled);
 
-// All of these also enable QUIC.
-NET_EXPORT NextProtoVector NextProtosSpdy31();
-NET_EXPORT NextProtoVector NextProtosSpdy4Http2();
-
 }  // namespace net
 
 #endif  // NET_SOCKET_NEXT_PROTO_H_