Land Recent QUIC Changes.

net/tools/quic/test_tools/quic_dispatcher_peer.cc

Index: net/tools/quic/test_tools/quic_dispatcher_peer.cc
diff --git a/net/tools/quic/test_tools/quic_dispatcher_peer.cc b/net/tools/quic/test_tools/quic_dispatcher_peer.cc
index 03324a0b956031e57ab096fc0d2950feb0985dd3..730317549fc7eec88d7f7896cfe5bd8f0293dd17 100644
--- a/net/tools/quic/test_tools/quic_dispatcher_peer.cc
+++ b/net/tools/quic/test_tools/quic_dispatcher_peer.cc
@@ -6,8 +6,7 @@
 
 #include "net/quic/quic_default_packet_writer.h"
 #include "net/tools/quic/quic_dispatcher.h"
-
-using net::test::QuicTestWriter;
+#include "net/tools/quic/quic_packet_writer_wrapper.h"
 
 namespace net {
 namespace tools {
@@ -22,13 +21,14 @@ void QuicDispatcherPeer::SetTimeWaitListManager(
 
 // static
 void QuicDispatcherPeer::UseWriter(QuicDispatcher* dispatcher,
-                                   QuicTestWriter* writer) {
-  writer->set_writer(dispatcher->writer_.release());
-  dispatcher->writer_.reset(writer);
+                                   QuicPacketWriterWrapper* writer) {
+  writer->set_writer(dispatcher->writer_->release_writer());
+  dispatcher->writer_->set_writer(writer);
 }
 
 // static
-QuicPacketWriter* QuicDispatcherPeer::GetWriter(QuicDispatcher* dispatcher) {
+QuicPacketWriterWrapper* QuicDispatcherPeer::GetWriter(
+    QuicDispatcher* dispatcher) {
   return dispatcher->writer_.get();
 }