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 267 matching lines @@
       new jingle_glue::TransportChannelSocketAdapter(raw_event_channel_));
 
   // Create video channel.
   // TODO(wez): When we have RTP video support, we'll need to negotiate the
   // type of video channel to allocate, for legacy compatibility.
   raw_video_channel_ =
       cricket_session_->CreateChannel(content_name, kVideoChannelName);
   video_channel_.reset(
       new jingle_glue::TransportChannelSocketAdapter(raw_video_channel_));
 
-  if (!cricket_session_->initiator())
-    jingle_session_manager_->AcceptConnection(this, cricket_session_);
+  if (!cricket_session_->initiator()) {
+    if (!jingle_session_manager_->AcceptConnection(this, cricket_session_)) {
+      Close();
+      // Release session so that
+      // JingleSessionManager::SessionDestroyed() doesn't try to call
+      // cricket::SessionManager::DestroySession() for it.
+      ReleaseSession();
+      delete this;
+      return;
+    }
+  }
 
-  if (!closed_) {
-    // Set state to CONNECTING if the session is being accepted.
-    SetState(CONNECTING);
-  }
+  // Set state to CONNECTING if the session is being accepted.
+  SetState(CONNECTING);
 }
 
 bool JingleSession::EstablishPseudoTcp(
     net::Socket* channel,
     scoped_ptr<net::StreamSocket>* stream) {
   jingle_glue::PseudoTcpAdapter* adapter =
       new jingle_glue::PseudoTcpAdapter(channel);
   adapter->SetAckDelay(kTcpAckDelayMilliseconds);
   adapter->SetNoDelay(true);
 
@@ skipping 200 matching lines @@
 
     state_ = new_state;
     if (!closed_ && state_change_callback_.get())
       state_change_callback_->Run(new_state);
   }
 }
 
 }  // namespace protocol
 
 }  // namespace remoting