Delete Session and SessionManager object synchronously.

remoting/protocol/connection_to_client.cc

 // Copyright (c) 2012 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 13 matching lines @@
       session_(session) {
   session_->SetStateChangeCallback(
       base::Bind(&ConnectionToClient::OnSessionStateChange,
                  base::Unretained(this)));
   session_->SetRouteChangeCallback(
       base::Bind(&ConnectionToClient::OnSessionRouteChange,
                  base::Unretained(this)));
 }
 
 ConnectionToClient::~ConnectionToClient() {
-  if (session_.get()) {
-    base::MessageLoopProxy::current()->DeleteSoon(
-        FROM_HERE, session_.release());
-  }
 }
 
 void ConnectionToClient::SetEventHandler(EventHandler* event_handler) {
   DCHECK(CalledOnValidThread());
   handler_ = event_handler;
 }
 
 protocol::Session* ConnectionToClient::session() {
   DCHECK(CalledOnValidThread());
   return session_.get();
 }
 
 void ConnectionToClient::Disconnect() {
   DCHECK(CalledOnValidThread());
 
   CloseChannels();
 
   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.
-  base::MessageLoopProxy::current()->DeleteSoon(FROM_HERE, session);
+  scoped_ptr<Session> session = session_.Pass();
 
   // This should trigger OnConnectionClosed() event and this object
   // may be destroyed as the result.
   session->Close();
 }
 
 void ConnectionToClient::UpdateSequenceNumber(int64 sequence_number) {
   DCHECK(CalledOnValidThread());
   handler_->OnSequenceNumberUpdated(this, sequence_number);
 }
@@ skipping 98 matching lines @@
 }
 
 void ConnectionToClient::CloseChannels() {
   control_dispatcher_.reset();
   event_dispatcher_.reset();
   video_writer_.reset();
 }
 
 }  // namespace protocol
 }  // namespace remoting