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

trunk/src/webkit/glue/websocketstreamhandle_impl.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.
 
 // An implementation of WebSocketStreamHandle.
 
 #include "webkit/glue/websocketstreamhandle_impl.h"
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #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"
 #include "webkit/glue/websocketstreamhandle_bridge.h"
 #include "webkit/glue/websocketstreamhandle_delegate.h"
 
 using WebKit::WebData;
-using WebKit::WebSocketStreamError;
 using WebKit::WebSocketStreamHandle;
 using WebKit::WebSocketStreamHandleClient;
 using WebKit::WebURL;
 
 namespace webkit_glue {
 
 // WebSocketStreamHandleImpl::Context -----------------------------------------
 
 class WebSocketStreamHandleImpl::Context
     : public base::RefCounted<Context>,
@@ skipping 14 matching lines @@
   // Once detached, it never calls |client_| back.
   void Detach();
 
   // WebSocketStreamHandleDelegate methods:
   virtual void DidOpenStream(WebSocketStreamHandle*, int) OVERRIDE;
   virtual void DidSendData(WebSocketStreamHandle*, int) OVERRIDE;
   virtual void DidReceiveData(WebSocketStreamHandle*,
                               const char*,
                               int) OVERRIDE;
   virtual void DidClose(WebSocketStreamHandle*) OVERRIDE;
-  virtual void DidFail(WebSocketStreamHandle*, int, const string16&);
 
  private:
   friend class base::RefCounted<Context>;
   virtual ~Context() {
     DCHECK(!handle_);
     DCHECK(!client_);
     DCHECK(!bridge_);
   }
 
   WebSocketStreamHandleImpl* handle_;
@@ skipping 71 matching lines @@
   WebSocketStreamHandleImpl* handle = handle_;
   handle_ = NULL;
   if (client_) {
     WebSocketStreamHandleClient* client = client_;
     client_ = NULL;
     client->didClose(handle);
   }
   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(
     WebKitPlatformSupportImpl* platform)
     : ALLOW_THIS_IN_INITIALIZER_LIST(context_(new Context(this))),
       platform_(platform) {
 }
 
 WebSocketStreamHandleImpl::~WebSocketStreamHandleImpl() {
   // We won't receive any events from |context_|.
@@ skipping 13 matching lines @@
 
 bool WebSocketStreamHandleImpl::send(const WebData& data) {
   return context_->Send(data);
 }
 
 void WebSocketStreamHandleImpl::close() {
   context_->Close();
 }
 
 }  // namespace webkit_glue