Landing Recent QUIC changes until 01/31/2016 05:22 UTC

net/quic/test_tools/quic_test_utils.cc

Index: net/quic/test_tools/quic_test_utils.cc
diff --git a/net/quic/test_tools/quic_test_utils.cc b/net/quic/test_tools/quic_test_utils.cc
index ecd0b2e508d9672946db9b37618bfea148074930..b27203e0f55702176ba4016217c078f90e54e93c 100644
--- a/net/quic/test_tools/quic_test_utils.cc
+++ b/net/quic/test_tools/quic_test_utils.cc
@@ -295,11 +295,8 @@ PacketSavingConnection::~PacketSavingConnection() {
 }
 
 void PacketSavingConnection::SendOrQueuePacket(SerializedPacket* packet) {
-  if (!packet->packet->owns_buffer()) {
-    scoped_ptr<QuicEncryptedPacket> encrypted_deleter(packet->packet);
-    packet->packet = packet->packet->Clone();
-  }
-  encrypted_packets_.push_back(packet->packet);
+  encrypted_packets_.push_back(new QuicEncryptedPacket(
+      QuicUtils::CopyBuffer(*packet), packet->encrypted_length, true));
   // Transfer ownership of the packet to the SentPacketManager and the
   // ack notifier to the AckNotifierManager.
   sent_packet_manager_.OnPacketSent(packet, 0, QuicTime::Zero(), 1000,
@@ -357,7 +354,7 @@ TestQuicSpdyClientSession::TestQuicSpdyClientSession(
     : QuicClientSessionBase(connection, &push_promise_index_, config) {
   crypto_stream_.reset(new QuicCryptoClientStream(
       server_id, this, CryptoTestUtils::ProofVerifyContextForTesting(),
-      crypto_config));
+      crypto_config, this));
   Initialize();
 }