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 fb6ced9266b310a3ff2ceb38c0ca14730e284d65..8eb1f280a2b4bed1ed9978c3b5d53fa2349c74e2 100644
--- a/net/quic/quic_framer.h
+++ b/net/quic/quic_framer.h
@@ -233,7 +233,7 @@ class NET_EXPORT_PRIVATE QuicFramer {
   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);
+  static size_t GetMaxUnackedPackets(QuicPacketHeader header);
   // Size in bytes required for a serialized version negotiation packet
   size_t GetVersionNegotiationPacketSize(size_t number_versions);
 
@@ -246,7 +246,9 @@ class NET_EXPORT_PRIVATE QuicFramer {
   // Returns the associated data from the encrypted packet |encrypted| as a
   // stringpiece.
   static base::StringPiece GetAssociatedDataFromEncryptedPacket(
-      const QuicEncryptedPacket& encrypted, bool includes_version);
+      const QuicEncryptedPacket& encrypted,
+      QuicGuidLength guid_length,
+      bool includes_version);
 
   // Returns a SerializedPacket whose |packet| member is owned by the caller,
   // and is populated with the fields in |header| and |frames|, or is NULL if
@@ -353,6 +355,7 @@ class NET_EXPORT_PRIVATE QuicFramer {
   bool ProcessGoAwayFrame(QuicGoAwayFrame* frame);
 
   bool DecryptPayload(QuicPacketSequenceNumber packet_sequence_number,
+                      QuicGuidLength guid_length,
                       bool version_flag,
                       const QuicEncryptedPacket& packet);
 
@@ -400,6 +403,8 @@ class NET_EXPORT_PRIVATE QuicFramer {
   QuicErrorCode error_;
   // Updated by ProcessPacketHeader when it succeeds.
   QuicPacketSequenceNumber last_sequence_number_;
+  // Updated by WritePacketHeader.
+  QuicGuid last_serialized_guid_;
   // Buffer containing decrypted payload data during parsing.
   scoped_ptr<QuicData> decrypted_;
   // Version of the protocol being used.