Minor cleanups in JingleSession and JingleSessionManager.

remoting/protocol/jingle_session.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/protocol/jingle_session.h"
 
 #include "base/message_loop.h"
 #include "base/rand_util.h"
 #include "crypto/hmac.h"
 #include "crypto/rsa_private_key.h"
@@ skipping 141 matching lines @@
   if (local_private_key) {
     std::vector<uint8> key_bytes;
     CHECK(local_private_key->ExportPrivateKey(&key_bytes));
     local_private_key_.reset(
         crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_bytes));
     CHECK(local_private_key_.get());
   }
 }
 
 JingleSession::~JingleSession() {
-  DCHECK(closed_);
+  // Reset the callback so that it's not called from Close().
+  state_change_callback_.reset();
+  Close();
   jingle_session_manager_->SessionDestroyed(this);
 }
 
 void JingleSession::Init(cricket::Session* cricket_session) {
   DCHECK(CalledOnValidThread());
 
   cricket_session_ = cricket_session;
   jid_ = cricket_session_->remote_name();
   cert_verifier_.reset(new net::CertVerifier());
   cricket_session_->SignalState.connect(
@@ skipping 32 matching lines @@
     video_socket_.reset();
     video_ssl_socket_.reset();
     if (video_socket_wrapper_.get())
       video_socket_wrapper_->Disconnect();
 
     if (video_rtp_channel_.get())
       video_rtp_channel_->Close(result);
     if (video_rtcp_channel_.get())
       video_rtcp_channel_->Close(result);
 
-    if (cricket_session_)
+    if (cricket_session_) {
       cricket_session_->Terminate();
+      cricket_session_->SignalState.disconnect(this);
+      cricket_session_ = NULL;
+    }
 
     if (failed)
       SetState(FAILED);
     else
       SetState(CLOSED);
 
     closed_ = true;
   }
   cert_verifier_.reset();
 }
@@ skipping 447 matching lines @@
 
     state_ = new_state;
     if (!closed_ && state_change_callback_.get())
       state_change_callback_->Run(new_state);
   }
 }
 
 }  // namespace protocol
 
 }  // namespace remoting