tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 93209b724dee46694d5a3e675ac879e13d7a9ecf..069b2eb96ad82bb8b2fc88e3173e0ff4e9cc3bdb 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -18183,6 +18183,15 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <summary>Time to complete a speculative certificate verification.</summary>
 </histogram>
 
+<histogram name="Net.SSLProtocolNegotiation" enum="SSLProtocolNegotiation">
+  <owner>bnc@chromium.org</owner>
+  <summary>
+    TLS extension used to negotiate protocol (ALPN or NPN); in case of NPN,
+    whether the protocol is indeed supported by both the client and the server
+    or is a fallback because of no overlap; and the negotiated protocol itself.
+  </summary>
+</histogram>
+
 <histogram name="Net.SSLv3FallbackToRenegoPatchedServer"
     enum="TLSRenegotiationPatched">
   <obsolete>
@@ -52329,6 +52338,27 @@ To add a new entry, add it with any value and run test to compute valid value.
   </int>
 </enum>
 
+<enum name="SSLProtocolNegotiation" type="int">
+  <int value="1" label="ALPN, HTTP/1.1"/>
+  <int value="100" label="ALPN, SPDY 2.0"/>
+  <int value="101" label="ALPN, SPDY 3.0"/>
+  <int value="102" label="ALPN, SPDY 3.1"/>
+  <int value="103" label="ALPN, HTTP/2 draft-14"/>
+  <int value="200" label="ALPN, QUIC/1 + SPDY/3"/>
+  <int value="501" label="NPN, HTTP/1.1"/>
+  <int value="600" label="NPN, SPDY 2.0"/>
+  <int value="601" label="NPN, SPDY 3.0"/>
+  <int value="602" label="NPN, SPDY 3.1"/>
+  <int value="603" label="NPN, HTTP/2 draft-14"/>
+  <int value="700" label="NPN, QUIC/1 + SPDY/3"/>
+  <int value="1001" label="NPN, no overlap, fallback to HTTP/1.1"/>
+  <int value="1100" label="NPN, no overlap, fallback to SPDY 2.0"/>
+  <int value="1101" label="NPN, no overlap, fallback to SPDY 3.0"/>
+  <int value="1102" label="NPN, no overlap, fallback to SPDY 3.1"/>
+  <int value="1103" label="NPN, no overlap, fallback to HTTP/2 draft-14"/>
+  <int value="1200" label="NPN, no overlap, fallback to QUIC/1 + SPDY/3"/>

[jar (doing other things), 2014/10/11 01:13:59]

This also LG.  You *might* want to be as concises (shorter setences?) as
possible, as this text will appear to the left of the histogram, and leave far
less room for counters (as I recall).  

YMMV.  This will work.... and you *might* choose to revisit if it is not as
readable and desired.

[Bence, 2014/10/13 14:54:15]

Thank you.  I removed the phrase "no overlap", histogram summary above explains
it anyway.

Done.

+</enum>
+
 <enum name="SSLResponseTypesV2" type="int">
   <int value="0" label="SHOW_ALL"/>
   <int value="1" label="SHOW_OVERRIDABLE"/>