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

net/quic/core/quic_spdy_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.
 //
 // The base class for streams which deliver data to/from an application.
 // In each direction, the data on such a stream first contains compressed
 // headers then body data.
 
 #ifndef NET_QUIC_QUIC_SPDY_STREAM_H_
 #define NET_QUIC_QUIC_SPDY_STREAM_H_
 
 #include <stddef.h>
 #include <sys/types.h>
 
 #include <list>
 #include <string>
 
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
 #include "net/base/iovec.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_export.h"
 #include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_header_list.h"
 #include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_stream.h"
 #include "net/quic/core/quic_stream_sequencer.h"
-#include "net/quic/core/reliable_quic_stream.h"
 #include "net/spdy/spdy_framer.h"
 
 namespace net {
 
 namespace test {
 class QuicSpdyStreamPeer;
-class ReliableQuicStreamPeer;
+class QuicStreamPeer;
 }  // namespace test
 
 class QuicSpdySession;
 
 // This is somewhat arbitrary.  It's possible, but unlikely, we will either fail
 // to set a priority client-side, or cancel a stream before stripping the
 // priority from the wire server-side.  In either case, start out with a
 // priority in the middle.
 const SpdyPriority kDefaultPriority = 3;
 
 // A QUIC stream that can send and receive HTTP2 (SPDY) headers.
-class NET_EXPORT_PRIVATE QuicSpdyStream : public ReliableQuicStream {
+class NET_EXPORT_PRIVATE QuicSpdyStream : public QuicStream {
  public:
   // Visitor receives callbacks from the stream.
   class NET_EXPORT_PRIVATE Visitor {
    public:
     Visitor() {}
 
     // Called when the stream is closed.
     virtual void OnClose(QuicSpdyStream* stream) = 0;
 
     // Allows subclasses to override and do work.
     virtual void OnPromiseHeadersComplete(QuicStreamId promised_id,
                                           size_t frame_len) {}
 
    protected:
     virtual ~Visitor() {}
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Visitor);
   };
 
   QuicSpdyStream(QuicStreamId id, QuicSpdySession* spdy_session);
   ~QuicSpdyStream() override;
 
   // Override the base class to send QUIC_STREAM_NO_ERROR to the peer
   // when the stream has not received all the data.
   void CloseWriteSide() override;
   void StopReading() override;
 
-  // ReliableQuicStream implementation
+  // QuicStream implementation
   void OnClose() override;
 
   // Override to maybe close the write side after writing.
   void OnCanWrite() override;
 
   // Called by the session when headers with a priority have been received
   // for this stream.  This method will only be called for server streams.
   virtual void OnStreamHeadersPriority(SpdyPriority priority);
 
   // Called by the session when decompressed headers have been completely
@@ skipping 110 matching lines @@
   // Redirects to the headers stream if force HOL blocking enabled,
   // otherwise just pass through.
   QuicConsumedData WritevDataInner(
       QuicIOVector iov,
       QuicStreamOffset offset,
       bool fin,
       QuicAckListenerInterface* ack_notifier_delegate) override;
 
  private:
   friend class test::QuicSpdyStreamPeer;
-  friend class test::ReliableQuicStreamPeer;
+  friend class test::QuicStreamPeer;
   friend class QuicStreamUtils;
 
   QuicSpdySession* spdy_session_;
 
   Visitor* visitor_;
   // If true, allow sending of a request to continue while the response is
   // arriving.
   bool allow_bidirectional_data_;
   // True if the headers have been completely decompressed.
   bool headers_decompressed_;
@@ skipping 10 matching lines @@
   bool trailers_consumed_;
   // The parsed trailers received from the peer.
   SpdyHeaderBlock received_trailers_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicSpdyStream);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_SPDY_STREAM_H_