Fix WebSocket race between close and connect.

net/socket/websocket_transport_client_socket_pool_unittest.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 <queue>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 1067 matching lines @@
   EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority));
   // Now we have one socket handed out, and one pending.
   pool_.FlushWithError(ERR_FAILED);
   EXPECT_EQ(ERR_FAILED, request(1)->WaitForResult());
   // Socket owned by ClientSocketHandle is unaffected:
   EXPECT_TRUE(request(0)->handle()->socket());
   // Return it to the pool (which deletes it).
   request(0)->handle()->Reset();
 }
 
+// Sockets should not be leaked if CancelRequest() is called in between
+// SetSocket() being called on the ClientSocketHandle and InvokeUserCallback().
+TEST_F(WebSocketTransportClientSocketPoolTest, CancelRequestReclaimsSockets) {
+  host_resolver_->set_synchronous_mode(true);
+  MockTransportClientSocketFactory::ClientSocketType socket_types[] = {
+      MockTransportClientSocketFactory::MOCK_TRIGGERABLE_CLIENT_SOCKET,
+      MockTransportClientSocketFactory::MOCK_CLIENT_SOCKET};
+
+  client_socket_factory_.set_client_socket_types(socket_types,
+                                                 arraysize(socket_types));
+
+  EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority));
+
+  base::Closure connect_trigger =
+      client_socket_factory_.WaitForTriggerableSocketCreation();
+
+  request(0)->handle()->Reset();  // calls CancelRequest()
+
+  // We should now be able to create a new connection without blocking on the
+  // endpoint lock.
+  EXPECT_EQ(OK, StartRequest("a", kDefaultPriority));
+}
+
 }  // namespace
 
 }  // namespace net