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 8eb1f280a2b4bed1ed9978c3b5d53fa2349c74e2..76410db83bb74445eee2ca1a74a0d4b79c47ff10 100644
--- a/net/quic/quic_framer.h
+++ b/net/quic/quic_framer.h
@@ -248,7 +248,8 @@ class NET_EXPORT_PRIVATE QuicFramer {
   static base::StringPiece GetAssociatedDataFromEncryptedPacket(
       const QuicEncryptedPacket& encrypted,
       QuicGuidLength guid_length,
-      bool includes_version);
+      bool includes_version,
+      QuicSequenceNumberLength sequence_number_length);
 
   // 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
@@ -342,7 +343,9 @@ class NET_EXPORT_PRIVATE QuicFramer {
   bool ProcessPacketHeader(QuicPacketHeader* header,
                            const QuicEncryptedPacket& packet);
 
-  bool ProcessPacketSequenceNumber(QuicPacketSequenceNumber* sequence_number);
+  bool ProcessPacketSequenceNumber(
+      QuicSequenceNumberLength sequence_number_length,
+      QuicPacketSequenceNumber* sequence_number);
   bool ProcessFrameData();
   bool ProcessStreamFrame(QuicStreamFrame* frame);
   bool ProcessAckFrame(QuicAckFrame* frame);
@@ -354,20 +357,20 @@ class NET_EXPORT_PRIVATE QuicFramer {
   bool ProcessConnectionCloseFrame(QuicConnectionCloseFrame* frame);
   bool ProcessGoAwayFrame(QuicGoAwayFrame* frame);
 
-  bool DecryptPayload(QuicPacketSequenceNumber packet_sequence_number,
-                      QuicGuidLength guid_length,
-                      bool version_flag,
+  bool DecryptPayload(const QuicPacketHeader& header,
                       const QuicEncryptedPacket& packet);
 
   // Returns the full packet sequence number from the truncated
   // wire format version and the last seen packet sequence number.
   QuicPacketSequenceNumber CalculatePacketSequenceNumberFromWire(
+      QuicSequenceNumberLength sequence_number_length,
       QuicPacketSequenceNumber packet_sequence_number) const;
 
   // Computes the wire size in bytes of the payload of |frame|.
   size_t ComputeFrameLength(const QuicFrame& frame);
 
   static bool AppendPacketSequenceNumber(
+      QuicSequenceNumberLength sequence_number_length,
       QuicPacketSequenceNumber packet_sequence_number,
       QuicDataWriter* writer);