Index: remoting/protocol/jingle_session.cc |
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc |
index b510ae8ae434e8974a8212c4bd4f56fb224aa863..830bec89956e510631ebe6ee36b9edbf2cb34ab8 100644 |
--- a/remoting/protocol/jingle_session.cc |
+++ b/remoting/protocol/jingle_session.cc |
@@ -65,8 +65,6 @@ JingleSession::JingleSession( |
} |
JingleSession::~JingleSession() { |
- // Reset the callback so that it's not called from Close(). |
- state_change_callback_.Reset(); |
Close(); |
jingle_session_manager_->SessionDestroyed(this); |
} |
@@ -235,7 +233,8 @@ const std::string& JingleSession::shared_secret() { |
void JingleSession::Close() { |
DCHECK(CalledOnValidThread()); |
- |
+ // Reset the callback so that we don't call it anymore. |
Wez
2011/11/09 02:32:22
nit: Could reword: Ensure that we won't notify the
Sergey Ulanov
2011/11/09 21:24:00
Done.
|
+ state_change_callback_.Reset(); |
CloseInternal(net::ERR_CONNECTION_CLOSED, false); |
} |