Land Recent QUIC changes.

net/quic/test_tools/quic_test_utils.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_test_utils.h"
 
 #include "base/stl_util.h"
 #include "net/quic/crypto/crypto_framer.h"
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/crypto/crypto_utils.h"
@@ skipping 225 matching lines @@
 
 PacketSavingConnection::~PacketSavingConnection() {
   STLDeleteElements(&packets_);
   STLDeleteElements(&encrypted_packets_);
 }
 
 bool PacketSavingConnection::SendOrQueuePacket(
     EncryptionLevel level,
     QuicPacketSequenceNumber sequence_number,
     QuicPacket* packet,
-    QuicPacketEntropyHash entropy_hash,
-    HasRetransmittableData retransmittable) {
+    QuicPacketEntropyHash /* entropy_hash */,
+    HasRetransmittableData /* retransmittable */,
+    Force /* forced */) {
   packets_.push_back(packet);
   QuicEncryptedPacket* encrypted =
       framer_.EncryptPacket(level, sequence_number, *packet);
   encrypted_packets_.push_back(encrypted);
   return true;
 }
 
 MockSession::MockSession(QuicConnection* connection, bool is_server)
     : QuicSession(connection, DefaultQuicConfig(), is_server) {
   ON_CALL(*this, WritevData(_, _, _, _, _))
@@ skipping 184 matching lines @@
   data.AppendToString(&data_);
   return true;
 }
 
 void TestDecompressorVisitor::OnDecompressionError() {
   error_ = true;
 }
 
 }  // namespace test
 }  // namespace net