Remove dependency on headers stream from QuicSession.

net/tools/quic/quic_dispatcher_test.cc

Index: net/tools/quic/quic_dispatcher_test.cc
diff --git a/net/tools/quic/quic_dispatcher_test.cc b/net/tools/quic/quic_dispatcher_test.cc
index bf94210965e1eb44ff56f5259ee8533966b22618..af9d45e3b9de5bb43deabb2457e37d3d7e77e5e7 100644
--- a/net/tools/quic/quic_dispatcher_test.cc
+++ b/net/tools/quic/quic_dispatcher_test.cc
@@ -29,7 +29,6 @@ using base::StringPiece;
 using net::EpollServer;
 using net::test::ConstructEncryptedPacket;
 using net::test::MockConnection;
-using net::test::MockSession;
 using net::test::ValueRestore;
 using std::string;
 using std::vector;
@@ -44,18 +43,18 @@ namespace tools {
 namespace test {
 namespace {
 
-class TestServerSession : public QuicServerSession {
+class TestQuicSpdyServerSession : public QuicServerSession {
  public:
-  TestServerSession(const QuicConfig& config,
-                    QuicConnection* connection,
-                    const QuicCryptoServerConfig* crypto_config)
+  TestQuicSpdyServerSession(const QuicConfig& config,
+                            QuicConnection* connection,
+                            const QuicCryptoServerConfig* crypto_config)
       : QuicServerSession(config, connection, nullptr, crypto_config),
         crypto_stream_(QuicServerSession::GetCryptoStream()) {}
-  ~TestServerSession() override{};
+  ~TestQuicSpdyServerSession() override{};
 
   MOCK_METHOD2(OnConnectionClosed, void(QuicErrorCode error, bool from_peer));
-  MOCK_METHOD1(CreateIncomingDataStream, QuicDataStream*(QuicStreamId id));
-  MOCK_METHOD0(CreateOutgoingDataStream, QuicDataStream*());
+  MOCK_METHOD1(CreateIncomingDynamicStream, QuicDataStream*(QuicStreamId id));
+  MOCK_METHOD0(CreateOutgoingDynamicStream, QuicDataStream*());
 
   void SetCryptoStream(QuicCryptoServerStream* crypto_stream) {
     crypto_stream_ = crypto_stream;
@@ -66,7 +65,7 @@ class TestServerSession : public QuicServerSession {
  private:
   QuicCryptoServerStream* crypto_stream_;
 
-  DISALLOW_COPY_AND_ASSIGN(TestServerSession);
+  DISALLOW_COPY_AND_ASSIGN(TestQuicSpdyServerSession);
 };
 
 class TestDispatcher : public QuicDispatcher {
@@ -114,10 +113,10 @@ QuicServerSession* CreateSession(QuicDispatcher* dispatcher,
                                  QuicConnectionId connection_id,
                                  const IPEndPoint& client_address,
                                  const QuicCryptoServerConfig* crypto_config,
-                                 TestServerSession** session) {
+                                 TestQuicSpdyServerSession** session) {
   MockServerConnection* connection =
       new MockServerConnection(connection_id, dispatcher);
-  *session = new TestServerSession(config, connection, crypto_config);
+  *session = new TestQuicSpdyServerSession(config, connection, crypto_config);
   connection->set_visitor(*session);
   ON_CALL(*connection, SendConnectionClose(_)).WillByDefault(
       WithoutArgs(Invoke(
@@ -203,8 +202,8 @@ class QuicDispatcherTest : public ::testing::Test {
   IPEndPoint server_address_;
   TestDispatcher dispatcher_;
   MockTimeWaitListManager* time_wait_list_manager_;
-  TestServerSession* session1_;
-  TestServerSession* session2_;
+  TestQuicSpdyServerSession* session1_;
+  TestQuicSpdyServerSession* session2_;
   string data_;
 };