Adds QUIC_VERSION_36 which adds support to force HOL blocking between streams for measurement purpo…

net/quic/quic_protocol.cc

Index: net/quic/quic_protocol.cc
diff --git a/net/quic/quic_protocol.cc b/net/quic/quic_protocol.cc
index 41ef5c7bf7efba72d925f10284ce1bf7a6c16f7d..9829ab46c617de71c1a8400a04c815968137ebb7 100644
--- a/net/quic/quic_protocol.cc
+++ b/net/quic/quic_protocol.cc
@@ -192,6 +192,10 @@ QuicVersionVector FilterSupportedVersions(QuicVersionVector versions) {
         if (FLAGS_quic_enable_version_35) {
           filtered_versions.push_back(version);
         }
+      } else if (version == QUIC_VERSION_36) {
+        if (FLAGS_quic_enable_version_35 && FLAGS_quic_enable_version_36) {
+          filtered_versions.push_back(version);
+        }
       } else {
         filtered_versions.push_back(version);
       }
@@ -224,6 +228,8 @@ QuicTag QuicVersionToQuicTag(const QuicVersion version) {
       return MakeQuicTag('Q', '0', '3', '4');
     case QUIC_VERSION_35:
       return MakeQuicTag('Q', '0', '3', '5');
+    case QUIC_VERSION_36:
+      return MakeQuicTag('Q', '0', '3', '6');
     default:
       // This shold be an ERROR because we should never attempt to convert an
       // invalid QuicVersion to be written to the wire.
@@ -261,6 +267,7 @@ string QuicVersionToString(const QuicVersion version) {
     RETURN_STRING_LITERAL(QUIC_VERSION_33);
     RETURN_STRING_LITERAL(QUIC_VERSION_34);
     RETURN_STRING_LITERAL(QUIC_VERSION_35);
+    RETURN_STRING_LITERAL(QUIC_VERSION_36);
     default:
       return "QUIC_VERSION_UNSUPPORTED";
   }