Revert 196728 "Websocket should fire 'error' event if no server ..."

trunk/src/content/common/socket_stream_dispatcher.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.
 
 #include "content/common/socket_stream_dispatcher.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/id_map.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
-#include "base/string16.h"
-#include "base/utf_string_conversions.h"
 #include "content/common/child_thread.h"
 #include "content/common/socket_stream.h"
 #include "content/common/socket_stream_handle_data.h"
 #include "content/common/socket_stream_messages.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/net_errors.h"
 #include "webkit/glue/websocketstreamhandle_bridge.h"
 #include "webkit/glue/websocketstreamhandle_delegate.h"
 
 namespace content {
 
 // IPCWebSocketStreamHandleBridge is owned by each SocketStreamHandle.
 // It communicates with the main browser process via SocketStreamDispatcher.
 class IPCWebSocketStreamHandleBridge
     : public webkit_glue::WebSocketStreamHandleBridge {
  public:
@@ skipping 12 matching lines @@
   // webkit_glue::WebSocketStreamHandleBridge methods.
   virtual void Connect(const GURL& url) OVERRIDE;
   virtual bool Send(const std::vector<char>& data) OVERRIDE;
   virtual void Close() OVERRIDE;
 
   // Called by SocketStreamDispatcher.
   void OnConnected(int max_amount_send_allowed);
   void OnSentData(int amount_sent);
   void OnReceivedData(const std::vector<char>& data);
   void OnClosed();
-  void OnFailed(int error_code, const char* error_msg);
 
  private:
   virtual ~IPCWebSocketStreamHandleBridge();
 
   void DoConnect(const GURL& url);
   void DoClose();
 
   // The ID for this bridge and corresponding SocketStream instance in the
   // browser process.
   int socket_id_;
@@ skipping 91 matching lines @@
   if (socket_id_ != kNoSocketId) {
     all_bridges.Get().Remove(socket_id_);
     socket_id_ = kNoSocketId;
   }
   if (delegate_)
     delegate_->DidClose(handle_);
   delegate_ = NULL;
   Release();
 }
 
-void IPCWebSocketStreamHandleBridge::OnFailed(int error_code,
-                                              const char* error_msg) {
-  DVLOG(1) << "Bridge #" << socket_id_ << " OnFailed (error_code=" << error_code
-           << ")";
-  if (delegate_)
-    delegate_->DidFail(handle_, error_code, ASCIIToUTF16(error_msg));
-}
-
 void IPCWebSocketStreamHandleBridge::DoConnect(const GURL& url) {
   DCHECK(child_thread_);
   DCHECK_EQ(socket_id_, kNoSocketId);
   if (delegate_)
     delegate_->WillOpenStream(handle_, url);
 
   socket_id_ = all_bridges.Get().Add(this);
   DCHECK_NE(socket_id_, kNoSocketId);
   int render_view_id = MSG_ROUTING_NONE;
   const SocketStreamHandleData* data =
@@ skipping 28 matching lines @@
       ChildThread::current(), handle, delegate);
 }
 
 bool SocketStreamDispatcher::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SocketStreamDispatcher, msg)
     IPC_MESSAGE_HANDLER(SocketStreamMsg_Connected, OnConnected)
     IPC_MESSAGE_HANDLER(SocketStreamMsg_SentData, OnSentData)
     IPC_MESSAGE_HANDLER(SocketStreamMsg_ReceivedData, OnReceivedData)
     IPC_MESSAGE_HANDLER(SocketStreamMsg_Closed, OnClosed)
-    IPC_MESSAGE_HANDLER(SocketStreamMsg_Failed, OnFailed)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void SocketStreamDispatcher::OnConnected(int socket_id,
                                          int max_pending_send_allowed) {
   DVLOG(1) << "SocketStreamDispatcher::OnConnected (max_pending_send_allowed="
            << max_pending_send_allowed << ") to socket_id=" << socket_id;
 
@@ skipping 34 matching lines @@
   DVLOG(1) << "SocketStreamDispatcher::OnClosed to socket_id=" << socket_id;
 
   IPCWebSocketStreamHandleBridge* bridge =
       IPCWebSocketStreamHandleBridge::FromSocketId(socket_id);
   if (bridge)
     bridge->OnClosed();
   else
     DLOG(ERROR) << "No bridge for socket_id=" << socket_id;
 }
 
-void SocketStreamDispatcher::OnFailed(int socket_id, int error_code) {
-  IPCWebSocketStreamHandleBridge* bridge =
-      IPCWebSocketStreamHandleBridge::FromSocketId(socket_id);
-  if (bridge)
-    bridge->OnFailed(error_code, net::ErrorToString(error_code));
-  else
-    DLOG(ERROR) << "No bridge for socket_id=" << socket_id;
-}
-
 }  // namespace content