Minor cleanups in JingleSession and JingleSessionManager.

remoting/jingle_glue/xmpp_signal_strategy.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/jingle_glue/xmpp_signal_strategy.h"
 
 #include "base/logging.h"
 #include "jingle/notifier/base/gaia_token_pre_xmpp_auth.h"
 #include "remoting/jingle_glue/jingle_thread.h"
 #include "remoting/jingle_glue/xmpp_iq_request.h"
@@ skipping 11 matching lines @@
    : thread_(jingle_thread),
      listener_(NULL),
      username_(username),
      auth_token_(auth_token),
      auth_token_service_(auth_token_service),
      xmpp_client_(NULL),
      observer_(NULL) {
 }
 
 XmppSignalStrategy::~XmppSignalStrategy() {
-  if (xmpp_client_)
-    xmpp_client_->engine()->RemoveStanzaHandler(this);
-
   DCHECK(listener_ == NULL);
+  Close();
 }
 
 void XmppSignalStrategy::Init(StatusObserver* observer) {
   observer_ = observer;
 
   buzz::Jid login_jid(username_);
 
   buzz::XmppClientSettings settings;
   settings.set_user(login_jid.node());
   settings.set_host(login_jid.domain());
@@ skipping 82 matching lines @@
   }
 
   return new notifier::GaiaTokenPreXmppAuth(
       jid.Str(),
       settings.auth_cookie(),
       settings.token_service(),
       mechanism);
 }
 
 }  // namespace remoting