Remove dependency on headers stream from QuicSession.

net/quic/quic_headers_stream.cc

Index: net/quic/quic_headers_stream.cc
diff --git a/net/quic/quic_headers_stream.cc b/net/quic/quic_headers_stream.cc
index f1d972c5cfda4003bfdc39642ea638a9f7ab46ef..3fbb876e73e40ec0788818368f1a68b9c504f6ea 100644
--- a/net/quic/quic_headers_stream.cc
+++ b/net/quic/quic_headers_stream.cc
@@ -5,7 +5,7 @@
 #include "net/quic/quic_headers_stream.h"
 
 #include "base/strings/stringprintf.h"
-#include "net/quic/quic_session.h"
+#include "net/quic/quic_spdy_session.h"
 
 using base::StringPiece;
 using std::string;
@@ -169,8 +169,9 @@ class QuicHeadersStream::SpdyFramerVisitor
   DISALLOW_COPY_AND_ASSIGN(SpdyFramerVisitor);
 };
 
-QuicHeadersStream::QuicHeadersStream(QuicSession* session)
+QuicHeadersStream::QuicHeadersStream(QuicSpdySession* session)
     : ReliableQuicStream(kHeadersStreamId, session),
+      spdy_session_(session),
       stream_id_(kInvalidStreamId),
       fin_(false),
       frame_len_(0),
@@ -223,7 +224,7 @@ void QuicHeadersStream::OnSynStream(SpdyStreamId stream_id,
   DCHECK_EQ(kInvalidStreamId, stream_id_);
   stream_id_ = stream_id;
   fin_ = fin;
-  session()->OnStreamHeadersPriority(stream_id, priority);
+  spdy_session_->OnStreamHeadersPriority(stream_id, priority);
 }
 
 void QuicHeadersStream::OnSynReply(SpdyStreamId stream_id, bool fin) {
@@ -245,13 +246,13 @@ void QuicHeadersStream::OnControlFrameHeaderData(SpdyStreamId stream_id,
   if (len == 0) {
     DCHECK_NE(0u, stream_id_);
     DCHECK_NE(0u, frame_len_);
-    session()->OnStreamHeadersComplete(stream_id_, fin_, frame_len_);
+    spdy_session_->OnStreamHeadersComplete(stream_id_, fin_, frame_len_);
     // Reset state for the next frame.
     stream_id_ = kInvalidStreamId;
     fin_ = false;
     frame_len_ = 0;
   } else {
-    session()->OnStreamHeaders(stream_id_, StringPiece(header_data, len));
+    spdy_session_->OnStreamHeaders(stream_id_, StringPiece(header_data, len));
   }
 }