Landing Recent QUIC changes until Sun Apr 9 16:12:55

net/quic/core/quic_framer.h

Index: net/quic/core/quic_framer.h
diff --git a/net/quic/core/quic_framer.h b/net/quic/core/quic_framer.h
index 2ca8ea15e1792053df00598bf99c13a84b43bc8f..6cb85229ad04d795cc823e19f5d1de9f4bcf7006 100644
--- a/net/quic/core/quic_framer.h
+++ b/net/quic/core/quic_framer.h
@@ -386,6 +386,7 @@ class QUIC_EXPORT_PRIVATE QuicFramer {
   bool ProcessWindowUpdateFrame(QuicDataReader* reader,
                                 QuicWindowUpdateFrame* frame);
   bool ProcessBlockedFrame(QuicDataReader* reader, QuicBlockedFrame* frame);
+  void ProcessPaddingFrame(QuicDataReader* reader, QuicPaddingFrame* frame);
 
   bool DecryptPayload(QuicDataReader* encrypted_reader,
                       const QuicPacketHeader& header,
@@ -460,6 +461,8 @@ class QUIC_EXPORT_PRIVATE QuicFramer {
                                QuicDataWriter* writer);
   bool AppendBlockedFrame(const QuicBlockedFrame& frame,
                           QuicDataWriter* writer);
+  bool AppendPaddingFrame(const QuicPaddingFrame& frame,
+                          QuicDataWriter* writer);
 
   bool RaiseError(QuicErrorCode error);