Land Recent QUIC changes.

net/quic/quic_framer.h

Index: net/quic/quic_framer.h
diff --git a/net/quic/quic_framer.h b/net/quic/quic_framer.h
index 82868448b5244a2e8c929171a55b5cddbe6dd082..b13a257ece736977262deaebbc7901864f7bffe8 100644
--- a/net/quic/quic_framer.h
+++ b/net/quic/quic_framer.h
@@ -231,6 +231,9 @@ class NET_EXPORT_PRIVATE QuicFramer {
   static size_t GetMinConnectionCloseFrameSize();
   // Size in bytes of all GoAway frame fields without the reason phrase.
   static size_t GetMinGoAwayFrameSize();
+  // The maximum number of nacks which can be transmitted in a single ack packet
+  // without exceeding kMaxPacketSize.
+  static size_t GetMaxUnackedPackets(bool include_version);
   // Size in bytes required for a serialized version negotiation packet
   size_t GetVersionNegotiationPacketSize(size_t number_versions);