diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-07 21:07:54 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-07 21:07:54 +0000 |
| commit | 3962b77e13f8c9ff1642383b5e0afd4e3d3de43a (patch) | |
| tree | c0c9e7e354a66e708dda6046bf5c288de614b0ff /remoting/jingle_glue | |
| parent | 1c64421dc9b138892e371e6ef764719c95e79681 (diff) | |
| download | chromium_src-3962b77e13f8c9ff1642383b5e0afd4e3d3de43a.zip chromium_src-3962b77e13f8c9ff1642383b5e0afd4e3d3de43a.tar.gz chromium_src-3962b77e13f8c9ff1642383b5e0afd4e3d3de43a.tar.bz2 | |
Minor cleanups in JingleSession and JingleSessionManager.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7312013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
| -rw-r--r-- | remoting/jingle_glue/javascript_signal_strategy.cc | 1 | ||||
| -rw-r--r-- | remoting/jingle_glue/xmpp_signal_strategy.cc | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/remoting/jingle_glue/javascript_signal_strategy.cc b/remoting/jingle_glue/javascript_signal_strategy.cc index a09c30a..4e966b1 100644 --- a/remoting/jingle_glue/javascript_signal_strategy.cc +++ b/remoting/jingle_glue/javascript_signal_strategy.cc @@ -22,6 +22,7 @@ JavascriptSignalStrategy::JavascriptSignalStrategy(const std::string& your_jid) JavascriptSignalStrategy::~JavascriptSignalStrategy() { DCHECK(listener_ == NULL); + Close(); } void JavascriptSignalStrategy::AttachXmppProxy( diff --git a/remoting/jingle_glue/xmpp_signal_strategy.cc b/remoting/jingle_glue/xmpp_signal_strategy.cc index 74260c4..a5f9a2b 100644 --- a/remoting/jingle_glue/xmpp_signal_strategy.cc +++ b/remoting/jingle_glue/xmpp_signal_strategy.cc @@ -29,10 +29,8 @@ XmppSignalStrategy::XmppSignalStrategy(JingleThread* jingle_thread, } XmppSignalStrategy::~XmppSignalStrategy() { - if (xmpp_client_) - xmpp_client_->engine()->RemoveStanzaHandler(this); - DCHECK(listener_ == NULL); + Close(); } void XmppSignalStrategy::Init(StatusObserver* observer) { |