Independently enable SPDY versions from field trial.

net/socket/next_proto.h

 // 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.
 
 #ifndef NET_SOCKET_NEXT_PROTO_H_
 #define NET_SOCKET_NEXT_PROTO_H_
 
 #include <vector>
 
 #include "net/base/net_export.h"
@@ skipping 29 matching lines @@
   kProtoQUIC1SPDY3 = 200,
 
   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();
-
-// 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_