Land Recent QUIC Changes

net/tools/quic/quic_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/tools/quic/quic_client.h"
 
 #include <errno.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <sys/epoll.h>
@@ skipping 160 matching lines @@
     WaitForEvents();
   }
   return session_->connection()->connected();
 }
 
 bool QuicClient::StartConnect() {
   DCHECK(initialized_);
   DCHECK(!connected());
 
   QuicPacketWriter* writer = CreateQuicPacketWriter();
+
+  session_.reset(new QuicClientSession(
+      config_,
+      new QuicConnection(GenerateConnectionId(),
+                         server_address_,
+                         helper_.get(),
+                         writer,
+                         false  /* owns_writer */,
+                         false  /* is_server */,
+                         supported_versions_)));
+  // Reset |writer_| after |session_| so that the old writer outlives the old
+  // session.
   if (writer_.get() != writer) {
     writer_.reset(writer);
   }
-
-  session_.reset(new QuicClientSession(
-      config_,
-      new QuicConnection(GenerateConnectionId(), server_address_, helper_.get(),
-                         writer_.get(), false, supported_versions_)));
   session_->InitializeSession(server_id_, &crypto_config_);
   return session_->CryptoConnect();
 }
 
 bool QuicClient::EncryptionBeingEstablished() {
   return !session_->IsEncryptionEstablished() &&
       session_->connection()->connected();
 }
 
 void QuicClient::Disconnect() {
@@ skipping 135 matching lines @@
   QuicEncryptedPacket packet(buf, bytes_read, false);
 
   IPEndPoint client_address(client_ip, client_address_.port());
   session_->connection()->ProcessUdpPacket(
       client_address, server_address, packet);
   return true;
 }
 
 }  // namespace tools
 }  // namespace net