Land Recent QUIC Changes.

net/quic/quic_protocol.h

Index: net/quic/quic_protocol.h
diff --git a/net/quic/quic_protocol.h b/net/quic/quic_protocol.h
index e84d338f4ad062a19efef31a70e0073b38f1b127..60f8167e0456edeec97f2e9b8a263d6e93c0d123 100644
--- a/net/quic/quic_protocol.h
+++ b/net/quic/quic_protocol.h
@@ -112,6 +112,9 @@ const int64 kDefaultMaxTimeForCryptoHandshakeSecs = 5;  // 5 secs.
 // Default ping timeout.
 const int64 kPingTimeoutSecs = 15;  // 15 secs.
 
+// Default max packets in an FEC group.
+const size_t kMaxPacketsPerFecGroup = 10;
+
 // We define an unsigned 16-bit floating point value, inspired by IEEE floats
 // (http://en.wikipedia.org/wiki/Half_precision_floating-point_format),
 // with 5-bit exponent (bias 1), 11-bit mantissa (effective 12 with hidden
@@ -277,7 +280,6 @@ enum QuicVersion {
 
   QUIC_VERSION_15 = 15,
   QUIC_VERSION_16 = 16,
-  QUIC_VERSION_17 = 17,
   QUIC_VERSION_18 = 18,
   QUIC_VERSION_19 = 19,
   QUIC_VERSION_20 = 20,  // Current version.
@@ -293,7 +295,6 @@ enum QuicVersion {
 static const QuicVersion kSupportedQuicVersions[] = {QUIC_VERSION_20,
                                                      QUIC_VERSION_19,
                                                      QUIC_VERSION_18,
-                                                     QUIC_VERSION_17,
                                                      QUIC_VERSION_16,
                                                      QUIC_VERSION_15};
 
@@ -333,7 +334,8 @@ NET_EXPORT_PRIVATE std::string QuicVersionVectorToString(
 NET_EXPORT_PRIVATE QuicTag MakeQuicTag(char a, char b, char c, char d);
 
 // Returns true if the tag vector contains the specified tag.
-bool ContainsQuicTag(const QuicTagVector& tag_vector, QuicTag tag);
+NET_EXPORT_PRIVATE bool ContainsQuicTag(const QuicTagVector& tag_vector,
+                                        QuicTag tag);
 
 // Size in bytes of the data or fec packet header.
 NET_EXPORT_PRIVATE size_t GetPacketHeaderSize(const QuicPacketHeader& header);