Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / net / socket / next_proto.h

diff --git a/src/net/socket/next_proto.h b/src/net/socket/next_proto.h
index 08e6801..4df6e9b 100644 (file)
--- a/src/net/socket/next_proto.h
+++ b/src/net/socket/next_proto.h
@@ -14,8 +14,10 @@ namespace net {
 // Next Protocol Negotiation (NPN), if successful, results in agreement on an
 // application-level string that specifies the application level protocol to
 // use over the TLS connection. NextProto enumerates the application level
-// protocols that we recognise.  Do not change or reuse values, because they
-// are used to collect statistics on UMA.
+// protocols that we recognize.  Do not change or reuse values, because they
+// are used to collect statistics on UMA.  Also, values must be in [0,499),
+// because of the way TLS protocol negotiation extension information is added to
+// UMA histogram.
 enum NextProto {
   kProtoUnknown = 0,
   kProtoHTTP11 = 1,
@@ -48,9 +50,7 @@ NET_EXPORT NextProtoVector NextProtosWithSpdyAndQuic(bool spdy_enabled,
                                                      bool quic_enabled);
 
 // All of these also enable QUIC.
-NET_EXPORT NextProtoVector NextProtosSpdy3();
 NET_EXPORT NextProtoVector NextProtosSpdy31();
-NET_EXPORT NextProtoVector NextProtosSpdy31WithSpdy2();
 NET_EXPORT NextProtoVector NextProtosSpdy4Http2();
 
 }  // namespace net