Fix WebSocket race between close and connect.

Fix WebSocket race between close and connect.

If the WebSocket handshake was cancelled immediately after the connect
succeeded before the ClientSocketHandle was fully initialised, then the
socket would not be released back to the pool, and as a result the
endpoint would not be unlocked.

Fix by actively reclaiming the socket in
WebSocketTransportClientSocketPool::CancelRequest().

Also add a test for this condition.

BUG=394268, 389084
TEST=net_unittests

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=285175

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

https://codereview.chromium.org/394113003/diff/1/net/socket/websocket_transpo...
File net/socket/websocket_transport_client_socket_pool.cc (right):

https://codereview.chromium.org/394113003/diff/1/net/socket/websocket_transpo...
net/socket/websocket_transport_client_socket_pool.cc:365:
scoped_ptr<StreamSocket> socket = handle->PassSocket();
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]

https://codereview.chromium.org/394113003/diff/1/net/socket/websocket_transpo...
File net/socket/websocket_transport_client_socket_pool.cc (right):

https://codereview.chromium.org/394113003/diff/1/net/socket/websocket_transpo...
net/socket/websocket_transport_client_socket_pool.cc:365:
scoped_ptr<StreamSocket> socket = handle->PassSocket();
On 2014/07/18 07:52:08, yhirano wrote:
> ClientSocketHandle::PassSocket says:
> // SetSocket() must be called with a new socket before this handle            
 
> // is destroyed if is_initialized() is true.
> DCHECK(!is_initialized())?

Done.

[yhirano, 2014-07-22 10:36:09]

lgtm

[Adam Rice, 2014-07-22 12:25:47]

+jgraettinger for net OWNERS.

[Johnny, 2014-07-23 13:27:34]

lgtm

[Adam Rice, 2014-07-23 14:56:22]

The CQ bit was checked by ricea@chromium.org

[commit-bot: I haz the power, 2014-07-23 14:57:37]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/ricea@chromium.org/394113003/80001

[commit-bot: I haz the power, 2014-07-23 18:36:44]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  android_dbg_triggered_tests on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered...)

[commit-bot: I haz the power, 2014-07-23 18:56:39]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-07-23 18:56:40]

Try jobs failed on following builders:
  android_dbg_triggered_tests on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered...)

[Adam Rice, 2014-07-24 07:35:01]

The CQ bit was checked by ricea@chromium.org

[commit-bot: I haz the power, 2014-07-24 07:36:59]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/ricea@chromium.org/394113003/80001

[commit-bot: I haz the power, 2014-07-24 10:48:23]

Change committed as 285175