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

Unified Diff: extensions/browser/api/socket/tcp_socket.cc

Issue 2017113002: [Extensions] DCHECK that ExtensionFunctions respond (and only once) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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: extensions/browser/api/socket/tcp_socket.cc
diff --git a/extensions/browser/api/socket/tcp_socket.cc b/extensions/browser/api/socket/tcp_socket.cc
index 5053b869378fc05aaddaf1a27cf75ed0d60d539b..f3ba5ee48d26621eb9822aa0356635f5cf368a52 100644
--- a/extensions/browser/api/socket/tcp_socket.cc
+++ b/extensions/browser/api/socket/tcp_socket.cc
@@ -4,6 +4,7 @@
#include "extensions/browser/api/socket/tcp_socket.h"
+#include "base/callback_helpers.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/macros.h"
@@ -115,7 +116,11 @@ void TCPSocket::Disconnect() {
socket_->Disconnect();
server_socket_.reset(NULL);
connect_callback_.Reset();
- read_callback_.Reset();
+ // TODO(devlin): Should we do this for all callbacks?
+ if (!read_callback_.is_null()) {
+ base::ResetAndReturn(&read_callback_)
+ .Run(net::ERR_CONNECTION_CLOSED, nullptr);
+ }
accept_callback_.Reset();
accept_socket_.reset(NULL);
}
« no previous file with comments | « extensions/browser/api/guest_view/web_view/web_view_internal_api.cc ('k') | extensions/browser/api/socket/udp_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698