Remove dependency on headers stream from QuicSession.

net/quic/quic_data_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_DATA_STREAM_H_
 #define NET_QUIC_QUIC_DATA_STREAM_H_
@@ skipping 14 matching lines @@
 #include "net/quic/reliable_quic_stream.h"
 #include "net/spdy/spdy_framer.h"
 
 namespace net {
 
 namespace test {
 class QuicDataStreamPeer;
 class ReliableQuicStreamPeer;
 }  // namespace test
 
-class QuicSession;
+class QuicSpdySession;
 
-// All this does right now is send data to subclasses via the sequencer.
+// A QUIC data stream that can also send and receive headers.
 class NET_EXPORT_PRIVATE QuicDataStream : public ReliableQuicStream {
  public:
   // Visitor receives callbacks from the stream.
   class NET_EXPORT_PRIVATE Visitor {
    public:
     Visitor() {}
 
     // Called when the stream is closed.
     virtual void OnClose(QuicDataStream* stream) = 0;
 
    protected:
     virtual ~Visitor() {}
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Visitor);
   };
 
-  QuicDataStream(QuicStreamId id, QuicSession* session);
-
+  QuicDataStream(QuicStreamId id, QuicSpdySession* spdy_session);
   ~QuicDataStream() override;
 
   // ReliableQuicStream implementation
   void OnClose() override;
   uint32 ProcessRawData(const char* data, uint32 data_len) override;
 
   // By default, this is the same as priority(), however it allows streams
   // to temporarily alter effective priority.   For example if a SPDY stream has
   // compressed but not written headers it can write the headers with a higher
   // priority.
@@ skipping 48 matching lines @@
 
  private:
   friend class test::QuicDataStreamPeer;
   friend class test::ReliableQuicStreamPeer;
   friend class QuicStreamUtils;
 
   uint32 ProcessHeaderData();
 
   bool FinishedReadingHeaders();
 
+  QuicSpdySession* spdy_session_;
+
   Visitor* visitor_;
-  // True if the headers have been completely decompresssed.
+  // True if the headers have been completely decompressed.
   bool headers_decompressed_;
   // The priority of the stream, once parsed.
   QuicPriority priority_;
   // Contains a copy of the decompressed headers until they are consumed
   // via ProcessData or Readv.
   std::string decompressed_headers_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicDataStream);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_DATA_STREAM_H_