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

Unified Diff: net/websockets/websocket_channel.cc

Issue 706203003: Update from https://crrev.com/303153 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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: net/websockets/websocket_channel.cc
diff --git a/net/websockets/websocket_channel.cc b/net/websockets/websocket_channel.cc
index 70c080f3c48cc75bf0ec35b0755d542cbb6997eb..598b5e64363ec1f7953c22a1875cad55c75a4344 100644
--- a/net/websockets/websocket_channel.cc
+++ b/net/websockets/websocket_channel.cc
@@ -582,7 +582,8 @@ void WebSocketChannel::OnConnectFailure(const std::string& message) {
// |this| has been deleted.
return;
}
- ignore_result(event_interface_->OnFailChannel(message_copy));
+ ChannelState result = event_interface_->OnFailChannel(message_copy);
+ DCHECK_EQ(CHANNEL_DELETED, result);
// |this| has been deleted.
}
@@ -1000,7 +1001,9 @@ ChannelState WebSocketChannel::FailChannel(const std::string& message,
// handshake.
stream_->Close();
SetState(CLOSED);
- return event_interface_->OnFailChannel(message);
+ ChannelState result = event_interface_->OnFailChannel(message);
+ DCHECK_EQ(CHANNEL_DELETED, result);
+ return result;
}
ChannelState WebSocketChannel::SendClose(uint16 code,
« no previous file with comments | « net/websockets/websocket_basic_handshake_stream.cc ('k') | net/websockets/websocket_handshake_stream_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698