Land Recent QUIC Changes.

net/tools/quic/test_tools/packet_dropping_test_writer.cc

Index: net/tools/quic/test_tools/packet_dropping_test_writer.cc
diff --git a/net/tools/quic/test_tools/packet_dropping_test_writer.cc b/net/tools/quic/test_tools/packet_dropping_test_writer.cc
index 11aafb694954b25ccdae8690cb23d1287e003bbf..fc80ed7fb64c1d9cd316bd931a876a250941f519 100644
--- a/net/tools/quic/test_tools/packet_dropping_test_writer.cc
+++ b/net/tools/quic/test_tools/packet_dropping_test_writer.cc
@@ -10,8 +10,6 @@
 #include "net/tools/quic/quic_epoll_connection_helper.h"
 #include "net/tools/quic/quic_socket_utils.h"
 
-using net::test::QuicTestWriter;
-
 namespace net {
 namespace tools {
 namespace test {
@@ -64,7 +62,7 @@ PacketDroppingTestWriter::PacketDroppingTestWriter()
   simple_random_.set_seed(seed);
 }
 
-PacketDroppingTestWriter::~PacketDroppingTestWriter() { }
+PacketDroppingTestWriter::~PacketDroppingTestWriter() {}
 
 void PacketDroppingTestWriter::SetConnectionHelper(
     QuicEpollConnectionHelper* helper) {
@@ -76,7 +74,8 @@ void PacketDroppingTestWriter::SetConnectionHelper(
 }
 
 WriteResult PacketDroppingTestWriter::WritePacket(
-    const char* buffer, size_t buf_len,
+    const char* buffer,
+    size_t buf_len,
     const net::IPAddressNumber& self_address,
     const net::IPEndPoint& peer_address,
     QuicBlockedWriterInterface* blocked_writer) {
@@ -133,12 +132,8 @@ WriteResult PacketDroppingTestWriter::WritePacket(
     return WriteResult(WRITE_STATUS_OK, buf_len);
   }
 
-  return writer()->WritePacket(buffer, buf_len, self_address, peer_address,
-                               blocked_writer);
-}
-
-bool PacketDroppingTestWriter::IsWriteBlockedDataBuffered() const {
-  return false;
+  return QuicPacketWriterWrapper::WritePacket(
+      buffer, buf_len, self_address, peer_address, blocked_writer);
 }
 
 QuicTime PacketDroppingTestWriter::ReleaseNextPacket() {
@@ -160,8 +155,9 @@ QuicTime PacketDroppingTestWriter::ReleaseNextPacket() {
   DLOG(INFO) << "Releasing packet.  " << (delayed_packets_.size() - 1)
              << " remaining.";
   // Grab the next one off the queue and send it.
-  writer()->WritePacket(iter->buffer.data(), iter->buffer.length(),
-                        iter->self_address, iter->peer_address, NULL);
+  QuicPacketWriterWrapper::WritePacket(
+      iter->buffer.data(), iter->buffer.length(),
+      iter->self_address, iter->peer_address, NULL);
   DCHECK_GE(cur_buffer_size_, iter->buffer.length());
   cur_buffer_size_ -= iter->buffer.length();
   delayed_packets_.erase(iter);