Fix QuicConnectionHelper's alarm implementation

net/quic/quic_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/quic_client_session.h"
 
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
@@ skipping 292 matching lines @@
     const CryptoHandshakeMessage& message) {
   logger_.OnCryptoHandshakeMessageSent(message);
 }
 
 void QuicClientSession::OnCryptoHandshakeMessageReceived(
     const CryptoHandshakeMessage& message) {
   logger_.OnCryptoHandshakeMessageReceived(message);
 }
 
 void QuicClientSession::ConnectionClose(QuicErrorCode error, bool from_peer) {
+  DCHECK(!connection()->connected());
   logger_.OnConnectionClose(error, from_peer);
   if (from_peer) {
     UMA_HISTOGRAM_SPARSE_SLOWLY(
         "Net.QuicSession.ConnectionCloseErrorCodeServer", error);
   } else {
     UMA_HISTOGRAM_SPARSE_SLOWLY(
         "Net.QuicSession.ConnectionCloseErrorCodeClient", error);
   }
 
   if (error == QUIC_CONNECTION_TIMED_OUT) {
     UMA_HISTOGRAM_SPARSE_SLOWLY(
         "Net.QuicSession.ConnectionClose.NumOpenStreams.TimedOut",
         GetNumOpenStreams());
   }
 
   UMA_HISTOGRAM_SPARSE_SLOWLY("Net.QuicSession.QuicVersion",
                               connection()->version());
   if (!callback_.is_null()) {
     base::ResetAndReturn(&callback_).Run(ERR_QUIC_PROTOCOL_ERROR);
   }
+  socket_->Close();
   QuicSession::ConnectionClose(error, from_peer);
   NotifyFactoryOfSessionCloseLater();
 }
 
 void QuicClientSession::OnSuccessfulVersionNegotiation(
     const QuicVersion& version) {
   logger_.OnSuccessfulVersionNegotiation(version);
   QuicSession::OnSuccessfulVersionNegotiation(version);
 }
 
@@ skipping 99 matching lines @@
 }
 
 void QuicClientSession::NotifyFactoryOfSessionClose() {
   DCHECK_EQ(0u, GetNumOpenStreams());
   DCHECK(stream_factory_);
   // Will delete |this|.
   stream_factory_->OnSessionClose(this);
 }
 
 }  // namespace net