Use a weak pointer to post service control events and session change notifications.

remoting/host/daemon_process.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/daemon_process.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 19 matching lines @@
 
 std::ostream& operator<<(std::ostream& os, const ScreenResolution& resolution) {
   return os << resolution.dimensions().width() << "x"
             << resolution.dimensions().height() << " at "
             << resolution.dpi().x() << "x" << resolution.dpi().y() << " DPI";
 }
 
 }  // namespace
 
 DaemonProcess::~DaemonProcess() {
-  DCHECK(!config_watcher_.get());
-  DCHECK(desktop_sessions_.empty());
+  DCHECK(caller_task_runner()->BelongsToCurrentThread());
+
+  host_event_logger_.reset();
+  weak_factory_.InvalidateWeakPtrs();
+
+  config_watcher_.reset();
+  DeleteAllDesktopSessions();
 }
 
 void DaemonProcess::OnConfigUpdated(const std::string& serialized_config) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   if (serialized_config_ != serialized_config) {
     serialized_config_ = serialized_config;
     SendToNetwork(
         new ChromotingDaemonNetworkMsg_Configuration(serialized_config_));
   }
@@ skipping 104 matching lines @@
 
   VLOG(1) << "Daemon: closed desktop session " << terminal_id;
   SendToNetwork(
       new ChromotingDaemonNetworkMsg_TerminalDisconnected(terminal_id));
 }
 
 DaemonProcess::DaemonProcess(
     scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
     scoped_refptr<AutoThreadTaskRunner> io_task_runner,
     const base::Closure& stopped_callback)
-    : Stoppable(caller_task_runner, stopped_callback),
-      caller_task_runner_(caller_task_runner),
+    : caller_task_runner_(caller_task_runner),
       io_task_runner_(io_task_runner),
       next_terminal_id_(0),
+      stopped_callback_(stopped_callback),
       weak_factory_(this) {
   DCHECK(caller_task_runner->BelongsToCurrentThread());
 }
 
 void DaemonProcess::CreateDesktopSession(int terminal_id,
                                          const ScreenResolution& resolution,
                                          bool virtual_terminal) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   // Validate the supplied terminal ID. An attempt to create a desktop session
@@ skipping 83 matching lines @@
                                               this));
   config_watcher_->Watch(config_path);
 
   host_event_logger_ =
       HostEventLogger::Create(weak_factory_.GetWeakPtr(), kApplicationName);
 
   // Launch the process.
   LaunchNetworkProcess();
 }
 
+void DaemonProcess::Stop() {
+  DCHECK(caller_task_runner()->BelongsToCurrentThread());
+
+  if (!stopped_callback_.is_null()) {
+    base::Closure stopped_callback = stopped_callback_;
+    stopped_callback_.Reset();
+    stopped_callback.Run();
+  }
+}
+
 bool DaemonProcess::WasTerminalIdAllocated(int terminal_id) {
   return terminal_id < next_terminal_id_;
 }
 
 void DaemonProcess::OnAccessDenied(const std::string& jid) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   FOR_EACH_OBSERVER(HostStatusObserver, status_observers_, OnAccessDenied(jid));
 }
 
@@ skipping 62 matching lines @@
 
   FOR_EACH_OBSERVER(HostStatusObserver, status_observers_, OnStart(xmpp_login));
 }
 
 void DaemonProcess::OnHostShutdown() {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   FOR_EACH_OBSERVER(HostStatusObserver, status_observers_, OnShutdown());
 }
 
-void DaemonProcess::DoStop() {
-  DCHECK(caller_task_runner()->BelongsToCurrentThread());
-
-  host_event_logger_.reset();
-  weak_factory_.InvalidateWeakPtrs();
-
-  config_watcher_.reset();
-  DeleteAllDesktopSessions();
-
-  CompleteStopping();
-}
-
 void DaemonProcess::DeleteAllDesktopSessions() {
   while (!desktop_sessions_.empty()) {
     delete desktop_sessions_.front();
     desktop_sessions_.pop_front();
   }
 }
 
 }  // namespace remoting