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

net/tools/quic/quic_simple_server_packet_writer.cc

Index: net/tools/quic/quic_simple_server_packet_writer.cc
diff --git a/net/tools/quic/quic_simple_server_packet_writer.cc b/net/tools/quic/quic_simple_server_packet_writer.cc
index 7674d06b229f14fc0d50d28d19aba32a0da397c7..cbf9405c2d87714a9342b7fcbe8a3bfe30d69d5b 100644
--- a/net/tools/quic/quic_simple_server_packet_writer.cc
+++ b/net/tools/quic/quic_simple_server_packet_writer.cc
@@ -29,10 +29,12 @@ WriteResult QuicSimpleServerPacketWriter::WritePacketWithCallback(
     size_t buf_len,
     const IPAddressNumber& self_address,
     const IPEndPoint& peer_address,
+    PerPacketOptions* options,
     WriteCallback callback) {
   DCHECK(callback_.is_null());
   callback_ = callback;
-  WriteResult result = WritePacket(buffer, buf_len, self_address, peer_address);
+  WriteResult result =
+      WritePacket(buffer, buf_len, self_address, peer_address, options);
   if (result.status != WRITE_STATUS_BLOCKED) {
     callback_.Reset();
   }
@@ -64,7 +66,8 @@ WriteResult QuicSimpleServerPacketWriter::WritePacket(
     const char* buffer,
     size_t buf_len,
     const IPAddressNumber& self_address,
-    const IPEndPoint& peer_address) {
+    const IPEndPoint& peer_address,
+    PerPacketOptions* options) {
   scoped_refptr<StringIOBuffer> buf(
       new StringIOBuffer(std::string(buffer, buf_len)));
   DCHECK(!IsWriteBlocked());