Remove dependency on headers stream from QuicSession.

net/tools/quic/quic_client_session_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/tools/quic/quic_client_session.h"
 
 #include <vector>
 
 #include "net/base/ip_endpoint.h"
 #include "net/quic/crypto/aes_128_gcm_12_encrypter.h"
 #include "net/quic/quic_flags.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
-#include "net/quic/test_tools/quic_session_peer.h"
+#include "net/quic/test_tools/quic_spdy_session_peer.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/tools/quic/quic_spdy_client_stream.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using net::test::ConstructEncryptedPacket;
 using net::test::ConstructMisFramedEncryptedPacket;
 using net::test::CryptoTestUtils;
 using net::test::DefaultQuicConfig;
 using net::test::MockConnection;
 using net::test::PacketSavingConnection;
-using net::test::QuicSessionPeer;
+using net::test::QuicSpdySessionPeer;
 using net::test::SupportedVersions;
 using net::test::TestPeerIPAddress;
 using net::test::ValueRestore;
 using net::test::kTestPort;
 using testing::AnyNumber;
 using testing::Invoke;
 using testing::Truly;
 using testing::_;
 
 namespace net {
@@ skipping 38 matching lines @@
 }
 
 TEST_P(ToolsQuicClientSessionTest, MaxNumStreams) {
   EXPECT_CALL(*connection_, SendRstStream(_, _, _)).Times(AnyNumber());
 
   session_->config()->SetMaxStreamsPerConnection(1, 1);
 
   // Initialize crypto before the client session will create a stream.
   CompleteCryptoHandshake();
 
-  QuicSpdyClientStream* stream = session_->CreateOutgoingDataStream();
+  QuicSpdyClientStream* stream = session_->CreateOutgoingDynamicStream();
   ASSERT_TRUE(stream);
-  EXPECT_FALSE(session_->CreateOutgoingDataStream());
+  EXPECT_FALSE(session_->CreateOutgoingDynamicStream());
 
   // Close a stream and ensure I can now open a new one.
   session_->CloseStream(stream->id());
-  stream = session_->CreateOutgoingDataStream();
+  stream = session_->CreateOutgoingDynamicStream();
   EXPECT_TRUE(stream);
 }
 
 TEST_P(ToolsQuicClientSessionTest, GoAwayReceived) {
   CompleteCryptoHandshake();
 
   // After receiving a GoAway, I should no longer be able to create outgoing
   // streams.
   session_->OnGoAway(QuicGoAwayFrame(QUIC_PEER_GOING_AWAY, 1u, "Going away."));
-  EXPECT_EQ(nullptr, session_->CreateOutgoingDataStream());
+  EXPECT_EQ(nullptr, session_->CreateOutgoingDynamicStream());
 }
 
 TEST_P(ToolsQuicClientSessionTest, SetFecProtectionFromConfig) {
   ValueRestore<bool> old_flag(&FLAGS_enable_quic_fec, true);
 
   // Set FEC config in client's connection options.
   QuicTagVector copt;
   copt.push_back(kFHDR);
   session_->config()->SetConnectionOptionsToSend(copt);
 
   // Doing the handshake should set up FEC config correctly.
   CompleteCryptoHandshake();
 
   // Verify that headers stream is always protected and data streams are
   // optionally protected.
-  EXPECT_EQ(FEC_PROTECT_ALWAYS,
-            QuicSessionPeer::GetHeadersStream(session_.get())->fec_policy());
-  QuicSpdyClientStream* stream = session_->CreateOutgoingDataStream();
+  EXPECT_EQ(FEC_PROTECT_ALWAYS, QuicSpdySessionPeer::GetHeadersStream(
+                                    session_.get())->fec_policy());
+  QuicSpdyClientStream* stream = session_->CreateOutgoingDynamicStream();
   ASSERT_TRUE(stream);
   EXPECT_EQ(FEC_PROTECT_OPTIONAL, stream->fec_policy());
 }
 
 static bool CheckForDecryptionError(QuicFramer* framer) {
   return framer->error() == QUIC_DECRYPTION_FAILURE;
 }
 
 // Regression test for b/17206611.
 TEST_P(ToolsQuicClientSessionTest, InvalidPacketReceived) {
@@ skipping 49 matching lines @@
       PACKET_6BYTE_SEQUENCE_NUMBER, nullptr));
   EXPECT_CALL(*connection_, SendConnectionCloseWithDetails(_, _)).Times(1);
   session_->connection()->ProcessUdpPacket(client_address, server_address,
                                            *packet);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace tools
 }  // namespace net