Land Recent QUIC Changes.

net/tools/quic/test_tools/packet_dropping_test_writer.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_TOOLS_QUIC_TEST_TOOLS_PACKET_DROPPING_TEST_WRITER_H_
 #define NET_TOOLS_QUIC_TEST_TOOLS_PACKET_DROPPING_TEST_WRITER_H_
 
 #include <list>
 
 #include "base/logging.h"
@@ skipping 24 matching lines @@
 
   // QuicPacketWriter methods:
   virtual WriteResult WritePacket(
       const char* buffer, size_t buf_len,
       const IPAddressNumber& self_address,
       const IPEndPoint& peer_address,
       QuicBlockedWriterInterface* blocked_writer) OVERRIDE;
 
   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_; }
 
   // The percent of time a packet is simulated as being lost.
   void set_fake_packet_loss_percentage(int32 fake_packet_loss_percentage) {
     base::AutoLock locked(config_mutex_);
     fake_packet_loss_percentage_ = fake_packet_loss_percentage;
   }
 
   // The percent of time WritePacket will block and set WriteResult's status
@@ skipping 31 matching lines @@
     base::AutoLock locked(config_mutex_);
     fake_bandwidth_ = fake_bandwidth;
     buffer_size_ = buffer_size;
   }
 
   void set_seed(uint64 seed) {
     simple_random_.set_seed(seed);
   }
 
  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:
     DelayedWrite(const char* buffer,
                  size_t buf_len,
                  const IPAddressNumber& self_address,
                  const IPEndPoint& peer_address,
                  QuicTime send_time);
     ~DelayedWrite();
 
@@ skipping 23 matching lines @@
   QuicByteCount buffer_size_;
 
   DISALLOW_COPY_AND_ASSIGN(PacketDroppingTestWriter);
 };
 
 }  // namespace test
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_TEST_TOOLS_PACKET_DROPPING_TEST_WRITER_H_