Delete Session and SessionManager object synchronously.

remoting/host/chromoting_host.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/host/chromoting_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
@@ skipping 21 matching lines @@
 namespace remoting {
 
 ChromotingHost::ChromotingHost(
     ChromotingHostContext* context,
     SignalStrategy* signal_strategy,
     DesktopEnvironment* environment,
     const protocol::NetworkSettings& network_settings)
     : context_(context),
       desktop_environment_(environment),
       network_settings_(network_settings),
-      have_shared_secret_(false),
       signal_strategy_(signal_strategy),
       stopping_recorders_(0),
       state_(kInitial),
       protocol_config_(protocol::CandidateSessionConfig::CreateDefault()),
       authenticating_client_(false),
       reject_authenticating_client_(false) {
   DCHECK(context_);
   DCHECK(signal_strategy);
   DCHECK(desktop_environment_);
   DCHECK(context_->network_message_loop()->BelongsToCurrentThread());
@@ skipping 41 matching lines @@
     shutdown_tasks_.push_back(shutdown_task);
   if (state_ == kStopping)
     return;
   state_ = kStopping;
 
   // Disconnect all of the clients, implicitly stopping the ScreenRecorder.
   while (!clients_.empty()) {
     clients_.front()->Disconnect();
   }
 
-  // Stop session manager.
-  if (session_manager_.get()) {
-    session_manager_->Close();
-    // It may not be safe to delete |session_manager_| here becase
-    // this method may be invoked in response to a libjingle event and
-    // libjingle's sigslot doesn't handle it properly, so postpone the
-    // deletion.
-    context_->network_message_loop()->DeleteSoon(
-        FROM_HERE, session_manager_.release());
-    have_shared_secret_ = false;
-  }
+  // Destroy session manager.
+  session_manager_.reset();
 
+  // Stop screen recorder
   if (recorder_.get()) {
     StopScreenRecorder();
   } else if (!stopping_recorders_) {
     ShutdownFinish();
   }
 }
 
 void ChromotingHost::AddStatusObserver(HostStatusObserver* observer) {
   DCHECK(context_->network_message_loop()->BelongsToCurrentThread());
   status_observers_.AddObserver(observer);
@@ skipping 248 matching lines @@
                     OnShutdown());
 
   for (std::vector<base::Closure>::iterator it = shutdown_tasks_.begin();
        it != shutdown_tasks_.end(); ++it) {
     it->Run();
   }
   shutdown_tasks_.clear();
 }
 
 }  // namespace remoting