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 2a736e0cfe209c39fefb41078f1bd43571b9e246..8ecaf1f0daada567cffaba535745be97b9a70663 100644
--- a/net/tools/quic/test_tools/packet_dropping_test_writer.h
+++ b/net/tools/quic/test_tools/packet_dropping_test_writer.h
@@ -7,14 +7,14 @@
 
 #include <list>
 
+#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "net/quic/quic_alarm.h"
 #include "net/quic/quic_blocked_writer_interface.h"
-#include "net/quic/quic_packet_writer.h"
-#include "net/quic/test_tools/quic_test_writer.h"
 #include "net/tools/quic/quic_epoll_clock.h"
+#include "net/tools/quic/quic_packet_writer_wrapper.h"
 #include "net/tools/quic/test_tools/quic_test_client.h"
 #include "net/tools/quic/test_tools/quic_test_utils.h"
 
@@ -25,7 +25,7 @@ namespace test {
 // Simulates a connection that drops packets a configured percentage of the time
 // and has a blocked socket a configured percentage of the time.  Also provides
 // the options to delay packets and reorder packets if delay is enabled.
-class PacketDroppingTestWriter : public net::test::QuicTestWriter {
+class PacketDroppingTestWriter : public QuicPacketWriterWrapper {
  public:
   PacketDroppingTestWriter();
 
@@ -35,13 +35,12 @@ class PacketDroppingTestWriter : public net::test::QuicTestWriter {
 
   // QuicPacketWriter methods:
   virtual WriteResult WritePacket(
-      const char* buffer, size_t buf_len,
+      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 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.