m58 merge QUIC: mark QUIC handshake failed if connection is closed after CryptoConnect

net/quic/chromium/quic_chromium_client_session.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/quic/chromium/quic_chromium_client_session.h"
 
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/location.h"
@@ skipping 652 matching lines @@
   return OK;
 }
 
 int QuicChromiumClientSession::CryptoConnect(
     const CompletionCallback& callback) {
   connect_timing_.connect_start = base::TimeTicks::Now();
   RecordHandshakeState(STATE_STARTED);
   DCHECK(flow_controller());
   crypto_stream_->CryptoConnect();
 
+  // Check if the connection is still open, issues during CryptoConnect like
+  // packet write error could cause the connection to be torn down.
+  if (!connection()->connected())
+    return ERR_QUIC_HANDSHAKE_FAILED;
+
   if (IsCryptoHandshakeConfirmed()) {
     connect_timing_.connect_end = base::TimeTicks::Now();
     return OK;
   }
 
   // Unless we require handshake confirmation, activate the session if
   // we have established initial encryption.
   if (!require_confirmation_ && IsEncryptionEstablished())
     return OK;
 
@@ skipping 837 matching lines @@
 }
 
 size_t QuicChromiumClientSession::EstimateMemoryUsage() const {
   // TODO(xunjieli): Estimate |crypto_stream_|, QuicSpdySession's
   // QuicHeaderList, QuicSession's QuiCWriteBlockedList, open streams and
   // unacked packet map.
   return base::trace_event::EstimateMemoryUsage(packet_readers_);
 }
 
 }  // namespace net