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

Looks like it made a layout test flaky.

http://test-results.appspot.com/dashboards/flakiness_dashboard.html#showLargeExpectations=true&showExpectations=true&tests=http%252Ftests%252Fwebsocket%252Ftests%252Fhybi%252Fclose.html

> Websocket should fire 'error' event if no server available
> Implement OnError virtual function, when network is down, OnError can be invoked.
> Send error code to render process from browser process through IPC.
> 
> This patch depends on Blink side patch which can be found from https://codereview.chromium.org/14071008/ 
> 
> 
> BUG=128057
> TEST=
> 
> Review URL: https://chromiumcodereview.appspot.com/10668018

TBR=li.yin@intel.com

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

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

3 files changed, 0 insertions, 28 deletions

diff --git a/content/common/socket_stream_dispatcher.cc b/content/common/socket_stream_dispatcher.cc
index 0d35135..1319116 100644
--- a/content/common/socket_stream_dispatcher.cc
+++ b/content/common/socket_stream_dispatcher.cc
@@ -11,14 +11,11 @@
 #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"
 
@@ -51,7 +48,6 @@ class IPCWebSocketStreamHandleBridge
   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();
@@ -163,14 +159,6 @@ void IPCWebSocketStreamHandleBridge::OnClosed() {
   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);
@@ -219,7 +207,6 @@ bool SocketStreamDispatcher::OnMessageReceived(const IPC::Message& msg) {
     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;
@@ -274,13 +261,4 @@ void SocketStreamDispatcher::OnClosed(int socket_id) {
     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
diff --git a/content/common/socket_stream_dispatcher.h b/content/common/socket_stream_dispatcher.h
index b619623..2a67f73 100644
--- a/content/common/socket_stream_dispatcher.h
+++ b/content/common/socket_stream_dispatcher.h
@@ -43,7 +43,6 @@ class SocketStreamDispatcher : public IPC::Listener {
   void OnSentData(int socket_id, int amount_sent);
   void OnReceivedData(int socket_id, const std::vector<char>& data);
   void OnClosed(int socket_id);
-  void OnFailed(int socket_id, int error_code);
 
   DISALLOW_COPY_AND_ASSIGN(SocketStreamDispatcher);
 };
diff --git a/content/common/socket_stream_messages.h b/content/common/socket_stream_messages.h
index 47eea33..020796d 100644
--- a/content/common/socket_stream_messages.h
+++ b/content/common/socket_stream_messages.h
@@ -73,8 +73,3 @@ IPC_MESSAGE_CONTROL2(SocketStreamMsg_SentData,
 // The Socket Stream is closed.
 IPC_MESSAGE_CONTROL1(SocketStreamMsg_Closed,
                      int /* socket_id */)
-
-// The Socket Stream is failed.
-IPC_MESSAGE_CONTROL2(SocketStreamMsg_Failed,
-                     int /* socket_id */,
-                     int /* error_code */)