The renderer has no way to indicate a close during connection except by

sending an OnDropChannel message. Since the code in content/ is mostly
stateless, we need to handle this in WebSocketChannel.

This CL changes the behaviour from ignoring the message (or crashing in
Debug builds) to cancelling the connection and responding with an
OnDropChannel message, freeing resources both in the browser and
renderer.

BUG=340602
TEST=net_unittests --gtest_filter=WebSocketChannel*

Review URL: https://codereview.chromium.org/140983009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248966 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 0 deletions

diff --git a/net/websockets/websocket_channel.cc b/net/websockets/websocket_channel.cc
index 388e371..0e68168 100644
--- a/net/websockets/websocket_channel.cc
+++ b/net/websockets/websocket_channel.cc
@@ -317,6 +317,13 @@ void WebSocketChannel::StartClosingHandshake(uint16 code,
             << ". This may be a bug, or a harmless race.";
     return;
   }
+  if (state_ == CONNECTING) {
+    // Abort the in-progress handshake and drop the connection immediately.
+    stream_request_.reset();
+    state_ = CLOSED;
+    AllowUnused(DoDropChannel(kWebSocketErrorAbnormalClosure, ""));
+    return;
+  }
   if (state_ != CONNECTED) {
     NOTREACHED() << "StartClosingHandshake() called in state " << state_;
     return;