Landing Recent QUIC changes until 12:43 PM, Nov 5, 2016 UTC+8

net/quic/core/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_CORE_QUIC_HEADERS_STREAM_H_
 #define NET_QUIC_CORE_QUIC_HEADERS_STREAM_H_
 
 #include <stddef.h>
 
 #include <memory>
 
 #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/reliable_quic_stream.h"
+#include "net/quic/core/quic_stream.h"
 #include "net/spdy/spdy_framer.h"
 
 namespace net {
 
 class QuicSpdySession;
 
 namespace test {
 class QuicHeadersStreamPeer;
 }  // namespace test
 
 // Headers in QUIC are sent as HTTP/2 HEADERS or PUSH_PROMISE frames
 // over a reserved reliable stream with the id 3.  Each endpoint
 // (client and server) will allocate an instance of QuicHeadersStream
 // to send and receive headers.
-class NET_EXPORT_PRIVATE QuicHeadersStream : public ReliableQuicStream {
+class NET_EXPORT_PRIVATE QuicHeadersStream : public QuicStream {
  public:
   class NET_EXPORT_PRIVATE HpackDebugVisitor {
    public:
     HpackDebugVisitor();
 
     virtual ~HpackDebugVisitor();
 
     // For each HPACK indexed representation processed, |elapsed| is
     // the time since the corresponding entry was added to the dynamic
     // table.
@@ skipping 24 matching lines @@
 
   // 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
+  // QuicStream 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();
 
   // Optional, enables instrumentation related to go/quic-hpack.
@@ skipping 75 matching lines @@
 
   SpdyFramer spdy_framer_;
   std::unique_ptr<SpdyFramerVisitor> spdy_framer_visitor_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicHeadersStream);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CORE_QUIC_HEADERS_STREAM_H_