Access ChromotingHost::clients_ only on network thread.

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/bind.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
 #include "base/rand_util.h"
@@ skipping 47 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() {
-  // 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();
   cricket_session_->SignalState.connect(
@@ skipping 148 matching lines @@
 }
 
 const std::string& JingleSession::shared_secret() {
   DCHECK(CalledOnValidThread());
   return shared_secret_;
 }
 
 
 void JingleSession::Close() {
   DCHECK(CalledOnValidThread());
-
+  // Reset the callback so that we don't call it anymore.

[Wez, 2011/11/09 02:32:22]

nit: Could reword: Ensure that we won't notify the callback again.

[Sergey Ulanov, 2011/11/09 21:24:00]

Done.

+  state_change_callback_.Reset();
   CloseInternal(net::ERR_CONNECTION_CLOSED, false);
 }
 
 void JingleSession::OnSessionState(
     BaseSession* session, BaseSession::State state) {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(cricket_session_, session);
 
   if (state_ == FAILED || state_ == CLOSED) {
     // Don't do anything if we already closed.
@@ skipping 218 matching lines @@
     DCHECK_NE(state_, FAILED);
 
     state_ = new_state;
     if (!state_change_callback_.is_null())
       state_change_callback_.Run(new_state);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting