Access ChromotingHost::clients_ only on network thread.

remoting/protocol/jingle_session_manager.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_manager.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/message_loop_proxy.h"
@@ skipping 20 matching lines @@
     : message_loop_(message_loop),
       signal_strategy_(NULL),
       allow_nat_traversal_(false),
       allow_local_ips_(false),
       http_port_allocator_(NULL),
       closed_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)) {
 }
 
 JingleSessionManager::~JingleSessionManager() {
+  // Session manager can be destroyed only after all sessions are destroyed.
+  DCHECK(sessions_.empty());
   Close();
 }
 
 void JingleSessionManager::Init(
     const std::string& local_jid,
     SignalStrategy* signal_strategy,
     Listener* listener,
     crypto::RSAPrivateKey* private_key,
     const std::string& certificate,
     bool allow_nat_traversal) {
@@ skipping 53 matching lines @@
     jingle_info_request_->Send(base::Bind(
         &JingleSessionManager::OnJingleInfo, base::Unretained(this)));
   } else {
     listener_->OnSessionManagerInitialized();
   }
 }
 
 void JingleSessionManager::Close() {
   DCHECK(CalledOnValidThread());
 
-  // Close() can be called only after all sessions are destroyed.
-  DCHECK(sessions_.empty());
-
   if (!closed_) {
     cricket_session_manager_->RemoveClient(kChromotingXmlNamespace);
     jingle_signaling_connector_.reset();
-    cricket_session_manager_.reset();
     closed_ = true;
   }
 }
 
 void JingleSessionManager::set_allow_local_ips(bool allow_local_ips) {
   allow_local_ips_ = allow_local_ips;
 }
 
 Session* JingleSessionManager::Connect(
     const std::string& host_jid,
@@ skipping 187 matching lines @@
     const std::string& certificate) {
   cricket::SessionDescription* desc = new cricket::SessionDescription();
   desc->AddContent(
       ContentDescription::kChromotingContentName, kChromotingXmlNamespace,
       new ContentDescription(config, "", certificate));
   return desc;
 }
 
 }  // namespace protocol
 }  // namespace remoting