Land Recent QUIC Changes.

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 6299f5af54cdb5f5067f1add30ecd1080772918f..2a736e0cfe209c39fefb41078f1bd43571b9e246 100644
--- a/net/tools/quic/test_tools/packet_dropping_test_writer.h
+++ b/net/tools/quic/test_tools/packet_dropping_test_writer.h
@@ -42,9 +42,10 @@ class PacketDroppingTestWriter : public net::test::QuicTestWriter {
 
   virtual bool IsWriteBlockedDataBuffered() const OVERRIDE;
 
-  // Writes out the next packet to the contained writer and returns the time
+  // Writes out any packet which should have been sent by now
+  // to the contained writer and returns the time
   // for the next delayed packet to be written.
-  QuicTime ReleaseNextPacket();
+  QuicTime ReleaseOldPackets();
 
   QuicBlockedWriterInterface* blocked_writer() { return blocked_writer_; }
 
@@ -96,6 +97,10 @@ class PacketDroppingTestWriter : public net::test::QuicTestWriter {
   }
 
  private:
+  // Writes out the next packet to the contained writer and returns the time
+  // for the next delayed packet to be written.
+  QuicTime ReleaseNextPacket();
+
   // A single packet which will be sent at the supplied send_time.
   class DelayedWrite {
    public: