Adds QUIC_VERSION_36 which adds support to force HOL blocking between streams for measurement purpo…

net/quic/quic_headers_stream.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_QUIC_QUIC_HEADERS_STREAM_H_
 #define NET_QUIC_QUIC_HEADERS_STREAM_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 47 matching lines @@
                               QuicAckListenerInterface* ack_listener);
 
   // Write |headers| for |promised_stream_id| on |original_stream_id| in a
   // PUSH_PROMISE frame to peer.
   // Return the size, in bytes, of the resulting PUSH_PROMISE frame.
   virtual size_t WritePushPromise(QuicStreamId original_stream_id,
                                   QuicStreamId promised_stream_id,
                                   SpdyHeaderBlock headers,
                                   QuicAckListenerInterface* ack_listener);
 
+  // For forcing HOL blocking.  This encapsulates data from other
+  // streams into HTTP/2 data frames on the headers stream.
+  QuicConsumedData WritevStreamData(
+      QuicStreamId id,
+      QuicIOVector iov,
+      QuicStreamOffset offset,
+      bool fin,
+      QuicAckListenerInterface* ack_notifier_delegate);
+
   // ReliableQuicStream implementation
   void OnDataAvailable() override;
 
   bool supports_push_promise() { return supports_push_promise_; }
 
   // Experimental: force HPACK to use static table and huffman coding
   // only.  Part of exploring improvements related to headers stream
   // induced HOL blocking in QUIC.
   void DisableHpackDynamicTable();
 
@@ skipping 38 matching lines @@
   void OnControlFrameHeaderData(SpdyStreamId stream_id,
                                 const char* header_data,
                                 size_t len);
 
   // Called when the complete list of headers is available.
   void OnHeaderList(const QuicHeaderList& header_list);
 
   // Called when the size of the compressed frame payload is available.
   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;
+  bool OnDataFrameHeader(QuicStreamId stream_id, size_t length, bool fin);
+  bool OnStreamFrameData(QuicStreamId stream_id, const char* data, size_t len);
+
   // Returns true if the session is still connected.
   bool IsConnected();
 
   QuicSpdySession* spdy_session_;
 
   // Data about the stream whose headers are being processed.
   QuicStreamId stream_id_;
   QuicStreamId promised_stream_id_;
   bool fin_;
   size_t frame_len_;
@@ skipping 17 matching lines @@
 
   // Either empty, or contains the complete list of headers.
   QuicHeaderList header_list_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicHeadersStream);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_HEADERS_STREAM_H_