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

net/quic/quic_spdy_session.h

Index: net/quic/quic_spdy_session.h
diff --git a/net/quic/quic_spdy_session.h b/net/quic/quic_spdy_session.h
index f08ad4c749265a652eda2fb765b4f22d7e0d2bdf..28a2437e58fbaaee295bcb58b2d562b5f8fc21a5 100644
--- a/net/quic/quic_spdy_session.h
+++ b/net/quic/quic_spdy_session.h
@@ -100,6 +100,14 @@ class NET_EXPORT_PRIVATE QuicSpdySession : public QuicSession {
 
   void OnConfigNegotiated() override;
 
+  // Called by |headers_stream_| when |force_hol_blocking_| is true.
+  virtual void OnStreamFrameData(QuicStreamId stream_id,
+                                 const char* data,
+                                 size_t len,
+                                 bool fin);
+
+  bool force_hol_blocking() const { return force_hol_blocking_; }
+
  protected:
   // Override CreateIncomingDynamicStream() and CreateOutgoingDynamicStream()
   // with QuicSpdyStream return type to make sure that all data streams are
@@ -121,6 +129,11 @@ class NET_EXPORT_PRIVATE QuicSpdySession : public QuicSession {
 
   std::unique_ptr<QuicHeadersStream> headers_stream_;
 
+  // If set, redirect all data through the headers stream in order to
+  // simulate forced HOL blocking between streams as happens in
+  // HTTP/2 over TCP.
+  bool force_hol_blocking_;
+
   DISALLOW_COPY_AND_ASSIGN(QuicSpdySession);
 };