Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/core/quic_stream.h

Index: net/quic/core/quic_stream.h
diff --git a/net/quic/core/quic_stream.h b/net/quic/core/quic_stream.h
index 5133fa9f30169cb320d040bee4939f0992021411..df1ebf0277b4f12ccd1faf8bcf625bea7c876008 100644
--- a/net/quic/core/quic_stream.h
+++ b/net/quic/core/quic_stream.h
@@ -186,6 +186,9 @@ class QUIC_EXPORT_PRIVATE QuicStream {
       bool fin,
       QuicReferenceCountedPointer<QuicAckListenerInterface> ack_listener);
 
+  // Adds random padding after the fin is consumed for this stream.
+  void AddRandomPaddingAfterFin();
+
  protected:
   // Sends as many bytes in the first |count| buffers of |iov| to the connection
   // as the connection will consume.
@@ -317,6 +320,10 @@ class QUIC_EXPORT_PRIVATE QuicStream {
   // For debugging only.
   size_t busy_counter_;
 
+  // Indicates whether paddings will be added after the fin is consumed for this
+  // stream.
+  bool add_random_padding_after_fin_;
+
   DISALLOW_COPY_AND_ASSIGN(QuicStream);
 };