Replace SSLProtocolNegotiation histogram with SSLNegotiatedAlpnProtocol.

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 8f90b44b5547b8036e6709dbab1b7c9a6e1b4166..dd900a29f4df61ebe755e7512c7d6bcfa153cd72 100644
--- a/net/socket/next_proto.h
+++ b/net/socket/next_proto.h
@@ -11,24 +11,14 @@
 
 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 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.
-const int kProtoSPDYHistogramOffset = 100;
+// This enum is used in SSL.AlpnNegotiatedProtocol histogram.
+// Do not change or re-use values.
 enum NextProto {
   kProtoUnknown = 0,
   kProtoHTTP11 = 1,
-  // kProtoSPDY31 = 102,
-  // kProtoHTTP2_14 = 103,  // HTTP/2 draft-14
-  // kProtoHTTP2_15 = 104,  // HTTP/2 draft-15
-  // kProtoHTTP2_16 = 105,  // HTTP/2 draft-16
-  // kProtoHTTP2_17 = 106,  // HTTP/2 draft-17
-  kProtoHTTP2 = 107,  // HTTP/2, see https://tools.ietf.org/html/rfc7540.
-  kProtoQUIC1SPDY3 = 200,
+  kProtoHTTP2 = 2,
+  kProtoQUIC1SPDY3 = 3,
+  kProtoNumberOfNextProtos = 4

[davidben, 2016/08/27 02:27:58]

Instead you can do:

  kProtoLast = kProtoQUIC1SPDY3,

Since it has the same value, the compiler won't grump at you about missing
switch-cases. It's also a bit less weird for when we need to stick a hole in
there. (It's not really a count.)

[Bence, 2016/08/29 12:54:33]

Done.

 };
 
 // List of protocols to use for NPN, used for configuring HttpNetworkSessions.