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_);
+  Close();

[Wez, 2011/07/06 21:24:25]

Is this safe?  Isn't it possible for |cricket_session_| to call back in to this
JingleSession after Terminate() has completed?

[Sergey Ulanov, 2011/07/06 23:15:01]

It may. Added line that resets |state_change_callback_| so that we don't call it
while being destructed.

[Wez, 2011/07/06 23:39:41]

Actually, I think the only way to be sure that you won't be called back by a
cricket::Session at some point after Terminate() is to Destroy() it.

[Sergey Ulanov, 2011/07/07 00:50:30]

We cannot destroy it because cricket::SessionManager owns it. I added code in
CloseInternal() that disconnects cricket::Session::SignalState signal, but it's
not strictly necessary because destruction of sigslot::has_slots<> would do it
anyway.

   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 498 matching lines @@
 
     state_ = new_state;
     if (!closed_ && state_change_callback_.get())
       state_change_callback_->Run(new_state);
   }
 }
 
 }  // namespace protocol
 
 }  // namespace remoting