Remove dependency on headers stream from QuicSession.

net/quic/quic_data_stream.cc

 // 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.
 
 #include "net/quic/quic_data_stream.h"
 
 #include "base/logging.h"
-#include "net/quic/quic_session.h"
+#include "net/quic/quic_spdy_session.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/quic_write_blocked_list.h"
 
 using base::StringPiece;
 using std::min;
 
 namespace net {
 
 #define ENDPOINT                                                               \
   (session()->perspective() == Perspective::IS_SERVER ? "Server: " : "Client:" \
                                                                      " ")
 
 namespace {
 
 // 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.
 QuicPriority kDefaultPriority = 3;
 
 }  // namespace
 
-QuicDataStream::QuicDataStream(QuicStreamId id, QuicSession* session)
-    : ReliableQuicStream(id, session),
+QuicDataStream::QuicDataStream(QuicStreamId id, QuicSpdySession* spdy_session)
+    : ReliableQuicStream(id, spdy_session),
+      spdy_session_(spdy_session),
       visitor_(nullptr),
       headers_decompressed_(false),
       priority_(kDefaultPriority) {
   DCHECK_NE(kCryptoStreamId, id);
   // Don't receive any callbacks from the sequencer until headers
   // are complete.
   sequencer()->SetBlockedUntilFlush();
 }
 
 QuicDataStream::~QuicDataStream() {
 }
 
 size_t QuicDataStream::WriteHeaders(
     const SpdyHeaderBlock& header_block,
     bool fin,
     QuicAckNotifier::DelegateInterface* ack_notifier_delegate) {
-  size_t bytes_written = session()->WriteHeaders(
+  size_t bytes_written = spdy_session_->WriteHeaders(
       id(), header_block, fin, priority_, ack_notifier_delegate);
   if (fin) {
     // TODO(rch): Add test to ensure fin_sent_ is set whenever a fin is sent.
     set_fin_sent(true);
     CloseWriteSide();
   }
   return bytes_written;
 }
 
 size_t QuicDataStream::Readv(const struct iovec* iov, size_t iov_len) {
@@ skipping 109 matching lines @@
     visitor_ = nullptr;
     visitor->OnClose(this);
   }
 }
 
 bool QuicDataStream::FinishedReadingHeaders() {
   return headers_decompressed_ && decompressed_headers_.empty();
 }
 
 }  // namespace net