Landing Recent QUIC changes until 8/28/2015 18:03 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 cab2bf72098cafece9b708034a1e5e9729747cbd..7412d30f207cef78c3c14016d43bd6da918b4201 100644
--- a/net/quic/test_tools/quic_test_utils.cc
+++ b/net/quic/test_tools/quic_test_utils.cc
@@ -58,7 +58,7 @@ QuicAckFrame MakeAckFrameWithNackRanges(size_t num_nack_ranges,
   QuicAckFrame ack = MakeAckFrame(2 * num_nack_ranges + least_unacked);
   // Add enough missing packets to get num_nack_ranges nack ranges.
   for (QuicPacketNumber i = 1; i < 2 * num_nack_ranges; i += 2) {
-    ack.missing_packets.insert(least_unacked + i);
+    ack.missing_packets.Add(least_unacked + i);
   }
   return ack;
 }
@@ -383,6 +383,8 @@ QuicCryptoClientStream* TestQuicSpdyClientSession::GetCryptoStream() {
 }
 
 MockPacketWriter::MockPacketWriter() {
+  ON_CALL(*this, GetMaxPacketSize(_))
+      .WillByDefault(testing::Return(kMaxPacketSize));
 }
 
 MockPacketWriter::~MockPacketWriter() {