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

net/quic/quic_chromium_packet_writer.cc

Index: net/quic/quic_chromium_packet_writer.cc
diff --git a/net/quic/quic_chromium_packet_writer.cc b/net/quic/quic_chromium_packet_writer.cc
index 93522180272a5b2cf5f563d092a1f880dad8cfe6..381313180d23490462aeefbeac8c9f32537bc45c 100644
--- a/net/quic/quic_chromium_packet_writer.cc
+++ b/net/quic/quic_chromium_packet_writer.cc
@@ -24,7 +24,8 @@ WriteResult QuicChromiumPacketWriter::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());