Landing recent QUIC changes until Sun Mar 5 09:18:09 2017 +0000

net/quic/core/quic_types.h

Index: net/quic/core/quic_types.h
diff --git a/net/quic/core/quic_types.h b/net/quic/core/quic_types.h
index 30fefd2137e69b831d471fcd4bab9c4c38eaebd3..fc665f3f383ffe9336b42ae11ab3eec4c7b83680 100644
--- a/net/quic/core/quic_types.h
+++ b/net/quic/core/quic_types.h
@@ -16,7 +16,6 @@
 
 namespace net {
 
-typedef uint8_t QuicPathId;
 typedef uint16_t QuicPacketLength;
 typedef uint32_t QuicHeaderId;
 typedef uint32_t QuicStreamId;
@@ -122,7 +121,6 @@ enum QuicFrameType {
   BLOCKED_FRAME = 5,
   STOP_WAITING_FRAME = 6,
   PING_FRAME = 7,
-  PATH_CLOSE_FRAME = 8,
 
   // STREAM and ACK frames are special frames. They are encoded differently on
   // the wire and their values do not need to be stable.
@@ -184,6 +182,8 @@ enum QuicPacketPublicFlags {
   PACKET_PUBLIC_FLAGS_4BYTE_PACKET = PACKET_FLAGS_4BYTE_PACKET << 4,
   PACKET_PUBLIC_FLAGS_6BYTE_PACKET = PACKET_FLAGS_6BYTE_PACKET << 4,
 
+  // TODO(fayang): Remove PACKET_PUBLIC_FLAGS_MULTIPATH when deprecating
+  // gfe2_reloadable_flag_quic_remove_multipath_bit.
   // Bit 6: Does the packet header contain a path id?
   PACKET_PUBLIC_FLAGS_MULTIPATH = 1 << 6,
 
@@ -192,8 +192,14 @@ enum QuicPacketPublicFlags {
   // Bit 7: indicates the presence of a second flags byte.
   PACKET_PUBLIC_FLAGS_TWO_OR_MORE_BYTES = 1 << 7,
 
+  // TODO(fayang): Remove PACKET_PUBLIC_FLAGS_MAX and rename
+  // PACKET_PUBLIC_FLAGS_MAX_WITHOUT_MULTIPATH_FLAG when deprecating
+  // gfe2_reloadable_flag_quic_remove_multipath_bit.
   // All bits set (bit 7 is not currently used): 01111111
   PACKET_PUBLIC_FLAGS_MAX = (1 << 7) - 1,
+
+  // All bits set (bits 6 and 7 are not currently used): 00111111
+  PACKET_PUBLIC_FLAGS_MAX_WITHOUT_MULTIPATH_FLAG = (1 << 6) - 1,
 };
 
 // The private flags are specified in one byte.