Fix WebSocket race between close and connect.

net/socket/websocket_transport_client_socket_pool.cc

 // Copyright 2014 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/socket/websocket_transport_client_socket_pool.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 344 matching lines @@
     int num_sockets,
     const BoundNetLog& net_log) {
   NOTIMPLEMENTED();
 }
 
 void WebSocketTransportClientSocketPool::CancelRequest(
     const std::string& group_name,
     ClientSocketHandle* handle) {
   if (DeleteStalledRequest(handle))
     return;
+  scoped_ptr<StreamSocket> socket = handle->PassSocket();

[yhirano, 2014/07/18 07:52:08]

ClientSocketHandle::PassSocket says:
// SetSocket() must be called with a new socket before this handle              
// is destroyed if is_initialized() is true.
DCHECK(!is_initialized())?

[Adam Rice, 2014/07/18 09:08:27]

Done.

+  if (socket)
+    ReleaseSocket(handle->group_name(), socket.Pass(), handle->id());
   if (!DeleteJob(handle))
     pending_callbacks_.erase(handle);
   if (!ReachedMaxSocketsLimit() && !stalled_request_queue_.empty())
     ActivateStalledRequest();
 }
 
 void WebSocketTransportClientSocketPool::ReleaseSocket(
     const std::string& group_name,
     scoped_ptr<StreamSocket> socket,
     int id) {
@@ skipping 260 matching lines @@
     const BoundNetLog& net_log)
     : params(params),
       priority(priority),
       handle(handle),
       callback(callback),
       net_log(net_log) {}
 
 WebSocketTransportClientSocketPool::StalledRequest::~StalledRequest() {}
 
 }  // namespace net