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, 41 deletions

diff --git a/webkit/glue/websocketstreamhandle_delegate.h b/webkit/glue/websocketstreamhandle_delegate.h
index 73c32e2..272538d 100644
--- a/webkit/glue/websocketstreamhandle_delegate.h
+++ b/webkit/glue/websocketstreamhandle_delegate.h
@@ -5,8 +5,6 @@
 #ifndef WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_DELEGATE_H_
 #define WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_DELEGATE_H_
 
-#include "base/string16.h"
-
 class GURL;
 
 namespace WebKit {
@@ -31,9 +29,6 @@ class WebSocketStreamHandleDelegate {
   virtual void DidReceiveData(WebKit::WebSocketStreamHandle* handle,
                               const char* data, int len) {}
   virtual void DidClose(WebKit::WebSocketStreamHandle*) {}
-  virtual void DidFail(WebKit::WebSocketStreamHandle* handle,
-                       int error_code,
-                       const string16& error_msg) {}
 
  protected:
   virtual ~WebSocketStreamHandleDelegate() {}
diff --git a/webkit/glue/websocketstreamhandle_impl.cc b/webkit/glue/websocketstreamhandle_impl.cc
index 2663d2f..b7a95e8 100644
--- a/webkit/glue/websocketstreamhandle_impl.cc
+++ b/webkit/glue/websocketstreamhandle_impl.cc
@@ -12,9 +12,7 @@
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebSocketStreamError.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSocketStreamHandleClient.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
 #include "webkit/glue/webkitplatformsupport_impl.h"
@@ -22,7 +20,6 @@
 #include "webkit/glue/websocketstreamhandle_delegate.h"
 
 using WebKit::WebData;
-using WebKit::WebSocketStreamError;
 using WebKit::WebSocketStreamHandle;
 using WebKit::WebSocketStreamHandleClient;
 using WebKit::WebURL;
@@ -57,7 +54,6 @@ class WebSocketStreamHandleImpl::Context
                               const char*,
                               int) OVERRIDE;
   virtual void DidClose(WebSocketStreamHandle*) OVERRIDE;
-  virtual void DidFail(WebSocketStreamHandle*, int, const string16&);
 
  private:
   friend class base::RefCounted<Context>;
@@ -149,18 +145,6 @@ void WebSocketStreamHandleImpl::Context::DidClose(
   Release();
 }
 
-void WebSocketStreamHandleImpl::Context::DidFail(
-    WebSocketStreamHandle* web_handle,
-    int error_code,
-    const string16& error_msg) {
-  VLOG(1) << "DidFail";
-  if (client_) {
-    client_->didFail(
-        handle_,
-        WebSocketStreamError(error_code, error_msg));
-  }
-}
-
 // WebSocketStreamHandleImpl ------------------------------------------------
 
 WebSocketStreamHandleImpl::WebSocketStreamHandleImpl(
diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.cc b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
index f43c87b..b28e1e1 100644
--- a/webkit/tools/test_shell/simple_socket_stream_bridge.cc
+++ b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
@@ -10,7 +10,6 @@
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
-#include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "net/socket_stream/socket_stream_job.h"
 #include "net/websockets/websocket_job.h"
@@ -49,7 +48,6 @@ class WebSocketStreamHandleBridgeImpl
   virtual void OnReceivedData(net::SocketStream* req,
                               const char* data, int len) OVERRIDE;
   virtual void OnClose(net::SocketStream* req) OVERRIDE;
-  virtual void OnError(const net::SocketStream* req, int error_code) OVERRIDE;
 
  private:
   virtual ~WebSocketStreamHandleBridgeImpl();
@@ -64,7 +62,6 @@ class WebSocketStreamHandleBridgeImpl
   void DoOnSentData(int amount_sent);
   void DoOnReceivedData(std::vector<char>* data);
   void DoOnClose();
-  void DoOnError(int error_code, const char* error_msg);
 
   int socket_id_;
   MessageLoop* message_loop_;
@@ -157,15 +154,6 @@ void WebSocketStreamHandleBridgeImpl::OnClose(net::SocketStream* socket) {
       base::Bind(&WebSocketStreamHandleBridgeImpl::DoOnClose, this));
 }
 
-void WebSocketStreamHandleBridgeImpl::OnError(
-    const net::SocketStream* socket, int error_code) {
-  base::subtle::NoBarrier_AtomicIncrement(&num_pending_tasks_, 1);
-  message_loop_->PostTask(
-      FROM_HERE,
-      base::Bind(&WebSocketStreamHandleBridgeImpl::DoOnError, this,
-                 error_code, net::ErrorToString(error_code)));
-}
-
 void WebSocketStreamHandleBridgeImpl::DoConnect(const GURL& url) {
   DCHECK(MessageLoop::current() == g_io_thread);
   socket_ = net::SocketStreamJob::CreateSocketStreamJob(
@@ -229,14 +217,6 @@ void WebSocketStreamHandleBridgeImpl::DoOnClose() {
   Release();
 }
 
-void WebSocketStreamHandleBridgeImpl::DoOnError(
-    int error_code, const char* error_msg) {
-  DCHECK(MessageLoop::current() == message_loop_);
-  base::subtle::NoBarrier_AtomicIncrement(&num_pending_tasks_, -1);
-  if (delegate_)
-    delegate_->DidFail(handle_, error_code, ASCIIToUTF16(error_msg));
-}
-
 }  // namespace
 
 /* static */