Moving host status events monitoring to a separate interface (HostStatusMonitor).

remoting/host/log_to_server.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/log_to_server.h"
 
 #include "base/bind.h"
 #include "base/message_loop_proxy.h"
 #include "remoting/base/constants.h"
-#include "remoting/host/chromoting_host.h"
+#include "remoting/host/host_status_monitor.h"
 #include "remoting/host/server_log_entry.h"
 #include "remoting/jingle_glue/iq_sender.h"
 #include "remoting/jingle_glue/signal_strategy.h"
 #include "remoting/protocol/transport.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "third_party/libjingle/source/talk/xmpp/constants.h"
 
 using buzz::QName;
 using buzz::XmlElement;
 
 namespace remoting {
 
-LogToServer::LogToServer(ChromotingHost* host,
+LogToServer::LogToServer(base::WeakPtr<HostStatusMonitor> monitor,
                          ServerLogEntry::Mode mode,
                          SignalStrategy* signal_strategy,
                          const std::string& directory_bot_jid)
-    : host_(host),
+    : monitor_(monitor),
       mode_(mode),
       signal_strategy_(signal_strategy),
       directory_bot_jid_(directory_bot_jid) {
+  monitor_->AddStatusObserver(this);
   signal_strategy_->AddListener(this);
-
-  // |host| may be NULL in tests.
-  if (host_)
-    host_->AddStatusObserver(this);
 }
 
 LogToServer::~LogToServer() {
   signal_strategy_->RemoveListener(this);
-  if (host_)
-    host_->RemoveStatusObserver(this);
+  if (monitor_)
+    monitor_->RemoveStatusObserver(this);
 }
 
 void LogToServer::LogSessionStateChange(const std::string& jid,
                                         bool connected) {
   DCHECK(CalledOnValidThread());
 
   scoped_ptr<ServerLogEntry> entry(
       ServerLogEntry::MakeForSessionStateChange(connected));
   entry->AddHostFields();
   entry->AddModeField(mode_);
@@ skipping 63 matching lines @@
   }
   // Send the stanza to the server.
   scoped_ptr<IqRequest> req = iq_sender_->SendIq(
       buzz::STR_SET, directory_bot_jid_, stanza.Pass(),
       IqSender::ReplyCallback());
   // We ignore any response, so let the IqRequest be destroyed.
   return;
 }
 
 }  // namespace remoting