Remove dependency on headers stream from QuicSession.

net/quic/quic_crypto_client_stream_test.cc

 // 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.
 
 #include "net/quic/quic_crypto_client_stream.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/crypto/aes_128_gcm_12_encrypter.h"
 #include "net/quic/crypto/quic_decrypter.h"
 #include "net/quic/crypto/quic_encrypter.h"
@@ skipping 21 matching lines @@
   QuicCryptoClientStreamTest()
       : server_id_(kServerHostname, kServerPort, false, PRIVACY_MODE_DISABLED) {
     CreateConnection();
   }
 
   void CreateConnection() {
     connection_ = new PacketSavingConnection(Perspective::IS_CLIENT);
     // Advance the time, because timers do not like uninitialized times.
     connection_->AdvanceTime(QuicTime::Delta::FromSeconds(1));
 
-    session_.reset(new TestClientSession(connection_, DefaultQuicConfig(),
-                                         server_id_, &crypto_config_));
+    session_.reset(new TestQuicSpdyClientSession(
+        connection_, DefaultQuicConfig(), server_id_, &crypto_config_));
   }
 
   void CompleteCryptoHandshake() {
     stream()->CryptoConnect();
     CryptoTestUtils::HandshakeWithFakeServer(connection_, stream());
   }
 
   void ConstructHandshakeMessage() {
     CryptoFramer framer;
     message_data_.reset(framer.ConstructHandshakeMessage(message_));
   }
 
   QuicCryptoClientStream* stream() { return session_->GetCryptoStream(); }
 
   PacketSavingConnection* connection_;
-  scoped_ptr<TestClientSession> session_;
+  scoped_ptr<TestQuicSpdyClientSession> session_;
   QuicServerId server_id_;
   CryptoHandshakeMessage message_;
   scoped_ptr<QuicData> message_data_;
   QuicCryptoClientConfig crypto_config_;
 };
 
 TEST_F(QuicCryptoClientStreamTest, NotInitiallyConected) {
   EXPECT_FALSE(stream()->encryption_established());
   EXPECT_FALSE(stream()->handshake_confirmed());
 }
@@ skipping 127 matching lines @@
       CryptoFramer::ConstructHandshakeMessage(server_config_update));
   stream()->ProcessRawData(data->data(), data->length());
 }
 
 class QuicCryptoClientStreamStatelessTest : public ::testing::Test {
  public:
   QuicCryptoClientStreamStatelessTest()
       : server_crypto_config_(QuicCryptoServerConfig::TESTING,
                               QuicRandom::GetInstance()),
         server_id_(kServerHostname, kServerPort, false, PRIVACY_MODE_DISABLED) {
-    TestClientSession* client_session = nullptr;
+    TestQuicSpdyClientSession* client_session = nullptr;
     CreateClientSessionForTest(server_id_,
                                /* supports_stateless_rejects= */ true,
                                QuicTime::Delta::FromSeconds(100000),
                                &client_crypto_config_, &client_connection_,
                                &client_session);
     CHECK(client_session);
     client_session_.reset(client_session);
   }
 
   QuicCryptoServerStream* server_stream() {
     return server_session_->GetCryptoStream();
   }
 
   void AdvanceHandshakeWithFakeServer() {
     client_session_->GetCryptoStream()->CryptoConnect();
     CryptoTestUtils::AdvanceHandshake(client_connection_,
                                       client_session_->GetCryptoStream(), 0,
                                       server_connection_, server_stream(), 0);
   }
 
   // Initializes the server_stream_ for stateless rejects.
   void InitializeFakeStatelessRejectServer() {
-    TestServerSession* server_session = nullptr;
+    TestQuicSpdyServerSession* server_session = nullptr;
     CreateServerSessionForTest(server_id_, QuicTime::Delta::FromSeconds(100000),
                                &server_crypto_config_, &server_connection_,
                                &server_session);
     CHECK(server_session);
     server_session_.reset(server_session);
     CryptoTestUtils::SetupCryptoServerConfigForTest(
         server_connection_->clock(), server_connection_->random_generator(),
         server_session_->config(), &server_crypto_config_);
     server_stream()->set_use_stateless_rejects_if_peer_supported(true);
   }
 
   // Client crypto stream state
   PacketSavingConnection* client_connection_;
-  scoped_ptr<TestClientSession> client_session_;
+  scoped_ptr<TestQuicSpdyClientSession> client_session_;
   QuicCryptoClientConfig client_crypto_config_;
 
   // Server crypto stream state
   PacketSavingConnection* server_connection_;
-  scoped_ptr<TestServerSession> server_session_;
+  scoped_ptr<TestQuicSpdyServerSession> server_session_;
   QuicCryptoServerConfig server_crypto_config_;
   QuicServerId server_id_;
 };
 
 TEST_F(QuicCryptoClientStreamStatelessTest, StatelessReject) {
   ValueRestore<bool> old_flag(&FLAGS_enable_quic_stateless_reject_support,
                               true);
 
   QuicCryptoClientConfig::CachedState* client_state =
       client_crypto_config_.LookupOrCreate(server_id_);
@@ skipping 20 matching lines @@
       client_state->GetNextServerDesignatedConnectionId();
   QuicConnectionId expected_id =
       server_session_->connection()->random_generator()->RandUint64();
   EXPECT_EQ(expected_id, server_designated_id);
   EXPECT_FALSE(client_state->has_server_designated_connection_id());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net