Landing Recent QUIC changes until Fri Nov 18 23:21:04 2016 +0000

net/quic/core/quic_headers_stream.h

Index: net/quic/core/quic_headers_stream.h
diff --git a/net/quic/core/quic_headers_stream.h b/net/quic/core/quic_headers_stream.h
index b10ec37d603c09241244171f3c7fe3ded9486870..e5ffc6c0170ea0a952aab7e926e86307a1e9adf4 100644
--- a/net/quic/core/quic_headers_stream.h
+++ b/net/quic/core/quic_headers_stream.h
@@ -12,7 +12,7 @@
 #include "base/macros.h"
 #include "net/base/net_export.h"
 #include "net/quic/core/quic_header_list.h"
-#include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_packets.h"
 #include "net/quic/core/quic_stream.h"
 #include "net/spdy/spdy_framer.h"
 
@@ -132,10 +132,15 @@ class NET_EXPORT_PRIVATE QuicHeadersStream : public QuicStream {
   void OnCompressedFrameSize(size_t frame_len);
 
   // For force HOL blocking, where stream frames from all streams are
-  // plumbed through headers stream as HTTP/2 data frames.  Return false
-  // if force_hol_blocking_ is false;
+  // plumbed through headers stream as HTTP/2 data frames.
+  // The following two return false if force_hol_blocking_ is false.
   bool OnDataFrameHeader(QuicStreamId stream_id, size_t length, bool fin);
   bool OnStreamFrameData(QuicStreamId stream_id, const char* data, size_t len);
+  // Helper for |WritevStreamData()|.
+  void WriteDataFrame(QuicStreamId stream_id,
+                      base::StringPiece data,
+                      bool fin,
+                      QuicAckListenerInterface* ack_notifier_delegate);
 
   // Returns true if the session is still connected.
   bool IsConnected();