Index: mojo/public/cpp/bindings/associated_binding.h |
diff --git a/mojo/public/cpp/bindings/associated_binding.h b/mojo/public/cpp/bindings/associated_binding.h |
index b6b7cd1098cf55bf19dea7a2ca4fd4648f217443..1971af18e242da434b0595054f357b44583ba4a1 100644 |
--- a/mojo/public/cpp/bindings/associated_binding.h |
+++ b/mojo/public/cpp/bindings/associated_binding.h |
@@ -90,6 +90,7 @@ class AssociatedBinding { |
void Close() { |
DCHECK(endpoint_client_); |
endpoint_client_.reset(); |
+ connection_error_handler_.reset(); |
} |
// Unbinds and returns the associated interface request so it can be |
@@ -103,12 +104,18 @@ class AssociatedBinding { |
&request, endpoint_client_->PassHandle()); |
endpoint_client_.reset(); |
+ connection_error_handler_.reset(); |
return request.Pass(); |
} |
// Sets an error handler that will be called if a connection error occurs. |
+ // |
+ // This method may only be called after this AssociatedBinding has been bound |
+ // to a message pipe. The error handler will be reset when this |
+ // AssociatedBinding is unbound or closed. |
void set_connection_error_handler(const Closure& error_handler) { |
+ DCHECK(is_bound()); |
connection_error_handler_ = error_handler; |
} |