Access ChromotingHost::clients_ only on network thread.

remoting/protocol/connection_to_client.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/connection_to_client.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
 #include "google/protobuf/message.h"
@@ skipping 16 matching lines @@
       control_connected_(false),
       input_connected_(false),
       video_connected_(false) {
   DCHECK(message_loop_);
   session_->SetStateChangeCallback(
       base::Bind(&ConnectionToClient::OnSessionStateChange,
                  base::Unretained(this)));
 }
 
 ConnectionToClient::~ConnectionToClient() {
-  // TODO(hclam): When we shut down the viewer we may have to close the
-  // connection.
+  if (session_.get())
+    message_loop_->DeleteSoon(FROM_HERE, session_.release());
 }
 
 void ConnectionToClient::SetEventHandler(EventHandler* event_handler) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   handler_ = event_handler;
 }
 
 protocol::Session* ConnectionToClient::session() {
   return session_.get();
 }
 
 void ConnectionToClient::Disconnect() {
-  // This method can be called from main thread so perform threading switching.
-  if (!message_loop_->BelongsToCurrentThread()) {
-    message_loop_->PostTask(
-        FROM_HERE, base::Bind(&ConnectionToClient::Disconnect, this));
-    return;
-  }
+  DCHECK(message_loop_->BelongsToCurrentThread());
 
   CloseChannels();
 
-  // If there is a session then release it, causing it to close.
-  if (session_.get())
-    session_.reset();
+  DCHECK(session_.get());
+  Session* session = session_.release();
+
+  // It may not be safe to delete |session_| here becase this method
+  // may be invoked in resonse to a libjingle event and libjingle's
+  // sigslot doesn't handle it properly, so postpone the deletion.
+  message_loop_->DeleteSoon(FROM_HERE, session);
+
+  // This should trigger OnConnectionClosed() event and this object
+  // may be destroyed as the result.
+  session->Close();
 }
 
 void ConnectionToClient::UpdateSequenceNumber(int64 sequence_number) {
   handler_->OnSequenceNumberUpdated(this, sequence_number);
 }
 
 VideoStub* ConnectionToClient::video_stub() {
   return video_writer_.get();
 }
 
@@ skipping 76 matching lines @@
 
 void ConnectionToClient::CloseChannels() {
   if (video_writer_.get())
     video_writer_->Close();
   if (client_control_sender_.get())
     client_control_sender_->Close();
 }
 
 }  // namespace protocol
 }  // namespace remoting