Websocket should fire 'error' event if no server available

net/socket_stream/socket_stream.cc

 // Copyright (c) 2012 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.
 //
 // TODO(ukai): code is similar with http_network_transaction.cc.  We should
 //   think about ways to share code, if possible.
 
 #include "net/socket_stream/socket_stream.h"
 
 #include <set>
@@ skipping 341 matching lines @@
   DCHECK_LE(result, OK);
   if (result == OK)
     result = ERR_CONNECTION_CLOSED;
   DCHECK_EQ(next_state_, STATE_NONE);
   DVLOG(1) << "Finish result=" << ErrorToString(result);
 
   metrics_->OnClose();
   Delegate* delegate = delegate_;
   delegate_ = NULL;
   if (delegate) {
-    delegate->OnError(this, result);
+    if (result != ERR_CONNECTION_CLOSED && result != ERR_PROTOCOL_SWITCHED)

[Li Yin, 2013/04/26 06:57:18]

I am unfamiliar with SwitchToSpdy related code, and don't know if this fix is
reasonable. Could you please have a look how to change TEST_F(SocketStreamTest,
SwitchToSpdy) and TEST_F(SocketStreamTest, SwitchAfterPending)?
Thanks.

[tyoshino (SeeGerritForStatus), 2013/04/26 07:19:43]

Yes. I'm looking here too. Raising ERR_PROTOCOL_SWITCHED is fine for
WebSocketJob. Sorry. You can remove result != ERR_PROTOCOL_SWITCHED from here.

But even with that, we still need to fix some part in the unittest.

As we've changed Blink side not to deref on OnError, it makes sense to change
the recorder to call completion callback on OnClose call instead. Then, we need
to change L364 too. I.e. removing if-clause.

But then some of Spdy tests fail. I'm looking

+      delegate->OnError(this, result);
     if (result != ERR_PROTOCOL_SWITCHED)
       delegate->OnClose(this);
   }
   Release();
 }
 
 int SocketStream::DidEstablishConnection() {
   if (!socket_.get() || !socket_->IsConnected()) {
     next_state_ = STATE_CLOSE;
     return ERR_CONNECTION_FAILED;
@@ skipping 934 matching lines @@
 
 SSLConfigService* SocketStream::ssl_config_service() const {
   return context_->ssl_config_service();
 }
 
 ProxyService* SocketStream::proxy_service() const {
   return context_->proxy_service();
 }
 
 }  // namespace net