Remove dependency on headers stream from QuicSession.

net/tools/quic/quic_server_session.h

 // Copyright (c) 2012 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.
 //
 // A server specific QuicSession subclass.
 
 #ifndef NET_TOOLS_QUIC_QUIC_SERVER_SESSION_H_
 #define NET_TOOLS_QUIC_QUIC_SERVER_SESSION_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/quic_crypto_server_stream.h"
 #include "net/quic/quic_protocol.h"
-#include "net/quic/quic_session.h"
+#include "net/quic/quic_spdy_session.h"
 
 namespace net {
 
 class QuicBlockedWriterInterface;
 class QuicConfig;
 class QuicConnection;
 class QuicCryptoServerConfig;
 class ReliableQuicStream;
 
 namespace tools {
@@ skipping 13 matching lines @@
                                   QuicErrorCode error) = 0;
   virtual void OnWriteBlocked(QuicBlockedWriterInterface* blocked_writer) = 0;
   // Called after the given connection is added to the time-wait list.
   virtual void OnConnectionAddedToTimeWaitList(QuicConnectionId connection_id) {
   }
   // Called after the given connection is removed from the time-wait list.
   virtual void OnConnectionRemovedFromTimeWaitList(
       QuicConnectionId connection_id) {}
 };
 
-class QuicServerSession : public QuicSession {
+class QuicServerSession : public QuicSpdySession {
  public:
   // |crypto_config| must outlive the session.
   QuicServerSession(const QuicConfig& config,
                     QuicConnection* connection,
                     QuicServerSessionVisitor* visitor,
                     const QuicCryptoServerConfig* crypto_config);
 
   // Override the base class to notify the owner of the connection close.
   void OnConnectionClosed(QuicErrorCode error, bool from_peer) override;
   void OnWriteBlocked() override;
@@ skipping 33 matching lines @@
 
   void set_use_stateless_rejects_if_peer_supported(
       bool use_stateless_rejects_if_peer_supported) {
     DCHECK(GetCryptoStream() != nullptr);
     GetCryptoStream()->set_use_stateless_rejects_if_peer_supported(
         use_stateless_rejects_if_peer_supported);
   }
 
  protected:
   // QuicSession methods:
-  QuicDataStream* CreateIncomingDataStream(QuicStreamId id) override;
-  QuicDataStream* CreateOutgoingDataStream() override;
+  QuicDataStream* CreateIncomingDynamicStream(QuicStreamId id) override;
+  QuicDataStream* CreateOutgoingDynamicStream() override;
   QuicCryptoServerStream* GetCryptoStream() override;
 
   // If we should create an incoming stream, returns true. Otherwise
   // does error handling, including communicating the error to the client and
   // possibly closing the connection, and returns false.
-  virtual bool ShouldCreateIncomingDataStream(QuicStreamId id);
+  virtual bool ShouldCreateIncomingDynamicStream(QuicStreamId id);
 
   virtual QuicCryptoServerStream* CreateQuicCryptoServerStream(
       const QuicCryptoServerConfig* crypto_config);
 
  private:
   friend class test::QuicServerSessionPeer;
 
   const QuicCryptoServerConfig* crypto_config_;
   scoped_ptr<QuicCryptoServerStream> crypto_stream_;
   QuicServerSessionVisitor* visitor_;
@@ skipping 14 matching lines @@
   // Number of packets sent to the peer, at the time we last sent a SCUP.
   int64 last_scup_sequence_number_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicServerSession);
 };
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_SERVER_SESSION_H_