Land Recent QUIC Changes

net/quic/test_tools/quic_connection_peer.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/test_tools/quic_connection_peer.h"
 
 #include "base/stl_util.h"
 #include "net/quic/congestion_control/receive_algorithm_interface.h"
 #include "net/quic/congestion_control/send_algorithm_interface.h"
 #include "net/quic/quic_connection.h"
@@ skipping 190 matching lines @@
   return connection->timeout_alarm_.get();
 }
 
 // static
 QuicPacketWriter* QuicConnectionPeer::GetWriter(QuicConnection* connection) {
   return connection->writer_;
 }
 
 // static
 void QuicConnectionPeer::SetWriter(QuicConnection* connection,
-                                   QuicPacketWriter* writer) {
+                                   QuicPacketWriter* writer,
+                                   bool owns_writer) {
+  if (connection->owns_writer_) {
+    delete connection->writer_;
+  }
   connection->writer_ = writer;
+  connection->owns_writer_ = owns_writer;
 }
 
 // static
 void QuicConnectionPeer::CloseConnection(QuicConnection* connection) {
   connection->connected_ = false;
 }
 
 // static
 QuicEncryptedPacket* QuicConnectionPeer::GetConnectionClosePacket(
     QuicConnection* connection) {
   return connection->connection_close_packet_.get();
 }
 
 // static
 void QuicConnectionPeer::SetSupportedVersions(QuicConnection* connection,
                                               QuicVersionVector versions) {
   connection->framer_.SetSupportedVersions(versions);
 }
 
 }  // namespace test
 }  // namespace net