Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(378)

Unified Diff: trunk/src/content/browser/renderer_host/socket_stream_dispatcher_host.cc

Issue 14335011: Revert 196728 "Websocket should fire 'error' event if no server ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/content/browser/renderer_host/socket_stream_dispatcher_host.cc
===================================================================
--- trunk/src/content/browser/renderer_host/socket_stream_dispatcher_host.cc (revision 196854)
+++ trunk/src/content/browser/renderer_host/socket_stream_dispatcher_host.cc (working copy)
@@ -101,23 +101,6 @@
DeleteSocketStreamHost(socket_id);
}
-void SocketStreamDispatcherHost::OnError(const net::SocketStream* socket,
- int error) {
- int socket_id = SocketStreamHost::SocketIdFromSocketStream(socket);
- DVLOG(1) << "SocketStreamDispatcherHost::OnError socket_id=" << socket_id;
- if (socket_id == content::kNoSocketId) {
- LOG(ERROR) << "NoSocketId in OnError";
- return;
- }
- // SocketStream::Delegate::OnError() events are handled as WebSocket error
- // event when user agent was required to fail WebSocket connection or the
- // WebSocket connection is closed with prejudice.
- if (!Send(new SocketStreamMsg_Failed(socket_id, error))) {
- LOG(ERROR) << "SocketStreamMsg_Failed failed.";
- DeleteSocketStreamHost(socket_id);
- }
-}
-
void SocketStreamDispatcherHost::OnSSLCertificateError(
net::SocketStream* socket, const net::SSLInfo& ssl_info, bool fatal) {
int socket_id = SocketStreamHost::SocketIdFromSocketStream(socket);

Powered by Google App Engine
This is Rietveld 408576698