Fail WebSocket channel when handshake fails.

net/websockets/websocket_channel.h

Index: net/websockets/websocket_channel.h
diff --git a/net/websockets/websocket_channel.h b/net/websockets/websocket_channel.h
index 61f191af97839b03fdc0c4cd3949cba92aef793a..4377869f7a6a136340dfc8c2d1c7e041c017ec92 100644
--- a/net/websockets/websocket_channel.h
+++ b/net/websockets/websocket_channel.h
@@ -153,7 +153,7 @@ class NET_EXPORT WebSocketChannel {
 
   // Failure callback from WebSocketStream::CreateAndConnectStream(). Reports
   // failure to the event interface. May delete |this|.
-  void OnConnectFailure(uint16 websocket_error);
+  void OnConnectFailure(const std::string& message);
 
   // Returns true if state_ is SEND_CLOSED, CLOSE_WAIT or CLOSED.
   bool InClosingState() const;
@@ -199,6 +199,8 @@ class NET_EXPORT WebSocketChannel {
                             const scoped_refptr<IOBuffer>& buffer,
                             size_t size) WARN_UNUSED_RESULT;
 
+  // TODO(yhirano): This is not the "Fail" operation but the (unclean) "Close"
+  // operation. Needs renaming & refactoring.

[Adam Rice, 2013/12/06 07:02:31]

It is certainly intended to implement the "Fail the WebSocket Connection"
operation as defined in RFC6455. In practice it is only used for protocol errors
after the handshake has completed.

The interface does need revising to allow for logging console messages.

[yhirano, 2013/12/06 08:54:56]

My understanding is that "_Fail the WebSocket Connection_" and just closing the
connection should be distinguished, is that right?
For example, WebSocketChannel::ProcessFrame calls FailChannel if the incoming
frame is masked, but the spec says that "a client MUST close a connection".
Currently FailChannels does NOT for "_Fail the WebSocket Connection_" but for
close. In other word, WebSocketChannel::ProcessFrame is correct -- just the
method name is wrong.
Thus I think renaming is needed.

[Adam Rice, 2013/12/09 01:21:41]

The spec goes on to say "In this case, it MAY use the status code 1002",
implying that it sends a Close frame before closing the TCP/IP connection. In
which case the behaviour is identical to _Fail the WebSocket Connection_ and it
is just a mistake in the RFC that it doesn't use that wording.

The WHATWG WebSocket API appears to require us to _Close the WebSocket
Connection_ without performing _Fail the WebSocket connection_ if the output
buffer is full (
http://www.whatwg.org/specs/web-apps/current-work/multipage/network.html#dom-...
). This wording appears to be new (replacing the old circular definition of
"with prejudice") but creates an unhelpful special case.

[yhirano, 2013/12/09 06:11:14]

Discussed offline.
I deleted the comment.
http://crbug.com/326899 will fix FailChannel.

   // Performs the "Fail the WebSocket Connection" operation as defined in
   // RFC6455. The supplied code and reason are sent back to the renderer in an
   // OnDropChannel message. If state_ is CONNECTED then a Close message is sent