Websocket should fire 'error' event if no server available

content/browser/renderer_host/socket_stream_dispatcher_host.cc

Index: content/browser/renderer_host/socket_stream_dispatcher_host.cc
diff --git a/content/browser/renderer_host/socket_stream_dispatcher_host.cc b/content/browser/renderer_host/socket_stream_dispatcher_host.cc
index 2eea8a88f2612c1bbfda2ca5a6b469c260a9109d..32d3a59eb408e8f44ab82353d98c023f95810990 100644
--- a/content/browser/renderer_host/socket_stream_dispatcher_host.cc
+++ b/content/browser/renderer_host/socket_stream_dispatcher_host.cc
@@ -101,6 +101,19 @@ void SocketStreamDispatcherHost::OnClose(net::SocketStream* socket) {
   DeleteSocketStreamHost(socket_id);
 }
 
+void SocketStreamDispatcherHost::OnError(const net::SocketStream* socket,
+                                         int error) {
+  int socket_id = SocketStreamHost::SocketIdFromSocketStream(socket);
+  DVLOG(1) << "SocketStreamDispatcherHost::OnError socket_id=" << socket_id;
+  if (socket_id == content::kNoSocketId) {
+    LOG(ERROR) << "NoSocketId in OnError";
+    return;
+  }

[tyoshino (SeeGerritForStatus), 2013/04/15 14:23:28]

Not to surprise reader, please write some short comment explaining that
SocketStream::Delegate::OnError() events are handled as the _Fail the ... event
in the protocol spec and this RPC message means that.

[Li Yin, 2013/04/16 12:07:37]

There is an issue here. OnError is almost called together with Onclose, it is so
senstive.
Maybe we should add some filter to avoid trigger onerror event every time.
What's your thought?

[tyoshino (SeeGerritForStatus), 2013/04/17 08:15:49]

Oh, right. We need to fix SocketStream. Could you please change
delegate->OnError(this, result) in SocketStream::Finish() to be invoked only
when result != ERR_CONNECTION_CLOSED && result != ERR_PROTOCOL_SWITCHED

+  if (!Send(new SocketStreamMsg_Failed(socket_id, error))) {
+    LOG(ERROR) << "SocketStreamMsg_Failed failed.";

[tyoshino (SeeGerritForStatus), 2013/04/15 14:23:28]

Add
DeleteSocketStreamHost(socket_id);
?

[Li Yin, 2013/04/16 12:07:37]

Good catch. I'll fix it. Thanks.

+  }
+}
+
 void SocketStreamDispatcherHost::OnSSLCertificateError(
     net::SocketStream* socket, const net::SSLInfo& ssl_info, bool fatal) {
   int socket_id = SocketStreamHost::SocketIdFromSocketStream(socket);