Landing Recent QUIC changes until: Fri Oct 30 22:23:58 2015 +0000

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/send_algorithm_interface.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_packet_writer.h"
@@ skipping 55 matching lines @@
   return &connection->sent_packet_manager_;
 }
 
 // static
 QuicTime::Delta QuicConnectionPeer::GetNetworkTimeout(
     QuicConnection* connection) {
   return connection->idle_network_timeout_;
 }
 
 // static
+QuicSentEntropyManager* QuicConnectionPeer::GetSentEntropyManager(
+    QuicConnection* connection) {
+  return &connection->sent_entropy_manager_;
+}
+
+// static
 // TODO(ianswett): Create a GetSentEntropyHash which accepts an AckFrame.
 QuicPacketEntropyHash QuicConnectionPeer::GetSentEntropyHash(
     QuicConnection* connection,
     QuicPacketNumber packet_number) {
   QuicSentEntropyManager::CumulativeEntropy last_entropy_copy =
       connection->sent_entropy_manager_.last_cumulative_entropy_;
   connection->sent_entropy_manager_.UpdateCumulativeEntropy(packet_number,
                                                             &last_entropy_copy);
   return last_entropy_copy.entropy;
 }
@@ skipping 120 matching lines @@
 }
 
 // static
 void QuicConnectionPeer::CloseConnection(QuicConnection* connection) {
   connection->connected_ = false;
 }
 
 // static
 QuicEncryptedPacket* QuicConnectionPeer::GetConnectionClosePacket(
     QuicConnection* connection) {
-  return connection->connection_close_packet_.get();
+  if (connection->termination_packets_ == nullptr ||
+      connection->termination_packets_->empty()) {
+    return nullptr;
+  }
+  return (*connection->termination_packets_)[0];
 }
 
 // static
 QuicPacketHeader* QuicConnectionPeer::GetLastHeader(
     QuicConnection* connection) {
   return &connection->last_header_;
 }
 
 // static
 void QuicConnectionPeer::SetPacketNumberOfLastSentPacket(
@@ skipping 20 matching lines @@
 }
 
 // static
 void QuicConnectionPeer::SetNextMtuProbeAt(QuicConnection* connection,
                                            QuicPacketNumber number) {
   connection->next_mtu_probe_at_ = number;
 }
 
 }  // namespace test
 }  // namespace net