Landing Recent QUIC changes until 01/26/2016 18:14 UTC

net/tools/quic/quic_default_packet_writer.cc

Index: net/tools/quic/quic_default_packet_writer.cc
diff --git a/net/tools/quic/quic_default_packet_writer.cc b/net/tools/quic/quic_default_packet_writer.cc
index fe3f4c692da4b9c570f07150c14a060082bd7717..efbd1ee9a7ada4cacd14b36de40857091974e0c5 100644
--- a/net/tools/quic/quic_default_packet_writer.cc
+++ b/net/tools/quic/quic_default_packet_writer.cc
@@ -17,8 +17,11 @@ WriteResult QuicDefaultPacketWriter::WritePacket(
     const char* buffer,
     size_t buf_len,
     const IPAddressNumber& self_address,
-    const IPEndPoint& peer_address) {
+    const IPEndPoint& peer_address,
+    PerPacketOptions* options) {
   DCHECK(!IsWriteBlocked());
+  DCHECK(nullptr == options)
+      << "QuicDefaultPacketWriter does not accept any options.";
   WriteResult result = QuicSocketUtils::WritePacket(fd_, buffer, buf_len,
                                                     self_address, peer_address);
   if (result.status == WRITE_STATUS_BLOCKED) {