Land Recent QUIC Changes.

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 67449ee75929b850cbf9ad768585188527a9f74f..5d883ca277f5dae53a5e63d18ff059dcc6253687 100644
--- a/net/quic/quic_protocol.cc
+++ b/net/quic/quic_protocol.cc
@@ -169,6 +169,8 @@ QuicTag QuicVersionToQuicTag(const QuicVersion version) {
       return MakeQuicTag('Q', '0', '1', '9');
     case QUIC_VERSION_20:
       return MakeQuicTag('Q', '0', '2', '0');
+    case QUIC_VERSION_21:
+      return MakeQuicTag('Q', '0', '2', '1');
     default:
       // This shold be an ERROR because we should never attempt to convert an
       // invalid QuicVersion to be written to the wire.
@@ -200,6 +202,7 @@ string QuicVersionToString(const QuicVersion version) {
     RETURN_STRING_LITERAL(QUIC_VERSION_18);
     RETURN_STRING_LITERAL(QUIC_VERSION_19);
     RETURN_STRING_LITERAL(QUIC_VERSION_20);
+    RETURN_STRING_LITERAL(QUIC_VERSION_21);
     default:
       return "QUIC_VERSION_UNSUPPORTED";
   }