Per-packet options now passed through to QuicPacketWriter, instead of

net/tools/quic/test_tools/packet_dropping_test_writer.h

Index: net/tools/quic/test_tools/packet_dropping_test_writer.h
diff --git a/net/tools/quic/test_tools/packet_dropping_test_writer.h b/net/tools/quic/test_tools/packet_dropping_test_writer.h
index 20554306263aabf63213e5f56baaa51d8ab70db7..ce38c40a0b56003f6939580e19fa62e00ee11418 100644
--- a/net/tools/quic/test_tools/packet_dropping_test_writer.h
+++ b/net/tools/quic/test_tools/packet_dropping_test_writer.h
@@ -50,7 +50,8 @@ class PacketDroppingTestWriter : public QuicPacketWriterWrapper {
   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 IsWriteBlocked() const override;
 
@@ -127,13 +128,22 @@ class PacketDroppingTestWriter : public QuicPacketWriterWrapper {
                  size_t buf_len,
                  const IPAddressNumber& self_address,
                  const IPEndPoint& peer_address,
+                 std::unique_ptr<PerPacketOptions> options,
                  QuicTime send_time);
+    // TODO(rtenneti): on windows RValue reference gives errors.
+    DelayedWrite(DelayedWrite&& other);

[ramant (doing other things), 2016/02/02 06:37:33]

My guess, is on windows, this method won't compile. Had a similar issue in
PacketNumberQueue. Will give this a try again.

https://code.google.com/p/chromium/codesearch#chromium/src/net/quic/quic_prot...

+    // TODO(rtenneti): on windows RValue reference gives errors.
+    //    DelayedWrite& operator=(DelayedWrite&& other);

[ramant (doing other things), 2016/02/02 06:37:33]

jdorfman: On linux, operator= results in an error - IPAddressNumber doesn't
support move. In chromium, this method is not needed.

     ~DelayedWrite();
 
     std::string buffer;
     const IPAddressNumber self_address;
     const IPEndPoint peer_address;
+    std::unique_ptr<PerPacketOptions> options;
     QuicTime send_time;
+
+   private:
+    DISALLOW_COPY_AND_ASSIGN(DelayedWrite);
   };
 
   typedef std::list<DelayedWrite> DelayedPacketList;