Access ChromotingHost::clients_ only on network thread.

remoting/protocol/pepper_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/pepper_session.h"
 
 #include "base/bind.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
@@ skipping 173 matching lines @@
 }
 
 const std::string& PepperSession::shared_secret() {
   DCHECK(CalledOnValidThread());
   return shared_secret_;
 }
 
 void PepperSession::Close() {
   DCHECK(CalledOnValidThread());
 
+  // Ensure that we won't notify the callback again.
+  state_change_callback_.Reset();
+
   if (state_ == CONNECTING || state_ == CONNECTED ||
       state_ == CONNECTED_CHANNELS) {
     // Send session-terminate message.
     JingleMessage message(peer_jid_, JingleMessage::SESSION_TERMINATE,
                           session_id_);
     scoped_ptr<IqRequest> terminate_request(
         session_manager_->iq_sender()->SendIq(
             message.ToXml(), IqSender::ReplyCallback()));
   }
 
@@ skipping 197 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