Land Recent QUIC Changes

net/tools/quic/quic_client.h

Index: net/tools/quic/quic_client.h
diff --git a/net/tools/quic/quic_client.h b/net/tools/quic/quic_client.h
index 2ea06bfab88748c16a92cbe4cbe69ab51c5b956f..a4fb6c31bd06343f1c2be696bb12f5275b2a95ff 100644
--- a/net/tools/quic/quic_client.h
+++ b/net/tools/quic/quic_client.h
@@ -214,6 +214,10 @@ class QuicClient : public EpollCallbackInterface,
   // Local port to bind to. Initialize to 0.
   int local_port_;
 
+  // Writer used to actually send packets to the wire. Needs to outlive
+  // |session_|.
+  scoped_ptr<QuicPacketWriter> writer_;
+
   // Session which manages streams.
   scoped_ptr<QuicClientSession> session_;
   // Listens for events on the client socket.
@@ -227,9 +231,6 @@ class QuicClient : public EpollCallbackInterface,
   // Listens for full responses.
   scoped_ptr<ResponseListener> response_listener_;
 
-  // Writer used to actually send packets to the wire.
-  scoped_ptr<QuicPacketWriter> writer_;
-
   // Tracks if the client is initialized to connect.
   bool initialized_;