Land Recent QUIC Changes.

net/quic/quic_default_packet_writer.h

Index: net/quic/quic_default_packet_writer.h
diff --git a/net/quic/quic_default_packet_writer.h b/net/quic/quic_default_packet_writer.h
index 92543604fab1861820767ba76f64ffe060107413..affc6f1b3a14d686d7023a56124cf8d8478b3480 100644
--- a/net/quic/quic_default_packet_writer.h
+++ b/net/quic/quic_default_packet_writer.h
@@ -15,7 +15,7 @@
 
 namespace net {
 
-class QuicBlockedWriterInterface;
+struct WriteResult;
 
 // Chrome specific packet writer which uses a DatagramClientSocket for writing
 // data.
@@ -29,8 +29,7 @@ class NET_EXPORT_PRIVATE QuicDefaultPacketWriter : public QuicPacketWriter {
   virtual WriteResult WritePacket(
       const char* buffer, size_t buf_len,
       const net::IPAddressNumber& self_address,
-      const net::IPEndPoint& peer_address,
-      QuicBlockedWriterInterface* blocked_writer) OVERRIDE;
+      const net::IPEndPoint& peer_address) OVERRIDE;
   virtual bool IsWriteBlockedDataBuffered() const OVERRIDE;
   virtual bool IsWriteBlocked() const OVERRIDE;
   virtual void SetWritable() OVERRIDE;