Land Recent QUIC Changes.

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 058aab447356e1f365af6b659c24139ca37e93b7..26651e201c4821f0c358526cbc46fffc73462437 100644
--- a/net/quic/test_tools/quic_test_utils.cc
+++ b/net/quic/test_tools/quic_test_utils.cc
@@ -117,7 +117,19 @@ FramerVisitorCapturingFrames::FramerVisitorCapturingFrames() : frame_count_(0) {
 }
 
 FramerVisitorCapturingFrames::~FramerVisitorCapturingFrames() {
+  Reset();
+}
+
+void FramerVisitorCapturingFrames::Reset() {
   STLDeleteElements(&stream_data_);
+  stream_frames_.clear();
+  frame_count_ = 0;
+  ack_.reset();
+  feedback_.reset();
+  rst_.reset();
+  close_.reset();
+  goaway_.reset();
+  version_negotiation_packet_.reset();
 }
 
 bool FramerVisitorCapturingFrames::OnPacketHeader(
@@ -272,7 +284,7 @@ bool PacketSavingConnection::SendOrQueuePacket(
 
 MockSession::MockSession(QuicConnection* connection, bool is_server)
     : QuicSession(connection, DefaultQuicConfig(), is_server) {
-  ON_CALL(*this, WritevData(_, _, _, _, _))
+  ON_CALL(*this, WritevData(_, _, _, _, _, _))
       .WillByDefault(testing::Return(QuicConsumedData(0, false)));
 }