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

Unified Diff: extensions/browser/api/socket/udp_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/udp_socket.cc
diff --git a/extensions/browser/api/socket/udp_socket.cc b/extensions/browser/api/socket/udp_socket.cc
index 6e58ac3a2ea623a3be494805d5f282f98c4de5eb..a5b924567425ca8362cb15910c65f449b117cf95 100644
--- a/extensions/browser/api/socket/udp_socket.cc
+++ b/extensions/browser/api/socket/udp_socket.cc
@@ -6,6 +6,7 @@
#include <algorithm>
+#include "base/callback_helpers.h"
#include "base/lazy_instance.h"
#include "extensions/browser/api/api_resource.h"
#include "net/base/ip_address.h"
@@ -83,7 +84,11 @@ void UDPSocket::Disconnect() {
is_connected_ = false;
socket_.Close();
read_callback_.Reset();
- recv_from_callback_.Reset();
+ // TODO(devlin): Should we do this for all callbacks?
+ if (!recv_from_callback_.is_null()) {
+ base::ResetAndReturn(&recv_from_callback_)
+ .Run(net::ERR_CONNECTION_CLOSED, nullptr, std::string(), 0);
+ }
send_to_callback_.Reset();
multicast_groups_.clear();
}
« no previous file with comments | « extensions/browser/api/socket/tcp_socket.cc ('k') | extensions/browser/api/sockets_udp/udp_socket_event_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698