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

net/quic/quic_chromium_packet_writer.h

Index: net/quic/quic_chromium_packet_writer.h
diff --git a/net/quic/quic_chromium_packet_writer.h b/net/quic/quic_chromium_packet_writer.h
index cd2d4d9d92a71c003d1b5a95e599f680be2c0b5d..23596d725d5b32c642a65547bb6e5f735b1d0cbc 100644
--- a/net/quic/quic_chromium_packet_writer.h
+++ b/net/quic/quic_chromium_packet_writer.h
@@ -30,7 +30,8 @@ class NET_EXPORT_PRIVATE QuicChromiumPacketWriter : public QuicPacketWriter {
   WriteResult WritePacket(const char* buffer,
                           size_t buf_len,
                           const IPAddressNumber& self_address,
-                          const IPEndPoint& peer_address) override;
+                          const IPEndPoint& peer_address,
+                          PerPacketOptions* options) override;
   bool IsWriteBlockedDataBuffered() const override;
   bool IsWriteBlocked() const override;
   void SetWritable() override;