Move signaling connection creation out of ChromotingHost.

remoting/host/log_to_server.h

 // 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.
 
 #ifndef REMOTING_HOST_LOG_TO_SERVER_H_
 #define REMOTING_HOST_LOG_TO_SERVER_H_
 
 #include <deque>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "remoting/host/host_status_observer.h"
 #include "remoting/host/server_log_entry.h"
+#include "remoting/jingle_glue/signal_strategy.h"
 
 namespace base {
 class MessageLoopProxy;
 }  // namespace base
 
 namespace buzz {
 class XmlElement;
 }  // namespace buzz
 
 namespace remoting {
 
+class ChromotingHost;
 class IqSender;
 
 /**
  * A class that sends log entries to a server.
  *
  * The class is not thread-safe.

[Wez, 2012/01/03 16:25:04]

nit: C++ify this comment, and clarify that "not thread-safe" means it must only
be used on the same thread as the signalling strategy?

[Sergey Ulanov, 2012/01/03 21:51:02]

Done. Removed the comment about non thread-safe. Will mark it as NonThreadSafe
in another CL.

  */
-class LogToServer : public HostStatusObserver {
+class LogToServer : public HostStatusObserver,
+                    public SignalStrategy::Listener {
  public:
-  explicit LogToServer(base::MessageLoopProxy* message_loop);
+  explicit LogToServer(SignalStrategy* signal_strategy);
   virtual ~LogToServer();
 
   // Logs a session state change.
   // Currently, this is either connection or disconnection.
   void LogSessionStateChange(bool connected);
 
-  // HostStatusObserver implementation.
-  virtual void OnSignallingConnected(SignalStrategy* signal_strategy) OVERRIDE;
-  virtual void OnSignallingDisconnected() OVERRIDE;
+  // SignalStrategy::Listener interface.
+  virtual void OnSignalStrategyStateChange(
+      SignalStrategy::State state) OVERRIDE;
+
+  // HostStatusObserver interface.
   virtual void OnClientAuthenticated(const std::string& jid) OVERRIDE;
   virtual void OnClientDisconnected(const std::string& jid) OVERRIDE;
   virtual void OnAccessDenied() OVERRIDE;
   virtual void OnShutdown() OVERRIDE;
 
  private:
   void Log(const ServerLogEntry& entry);
   void SendPendingEntries();
 
-  scoped_refptr<base::MessageLoopProxy> message_loop_;
+  scoped_refptr<ChromotingHost> host_;
+  SignalStrategy* signal_strategy_;
   scoped_ptr<IqSender> iq_sender_;
   std::deque<ServerLogEntry> pending_entries_;
 
   DISALLOW_COPY_AND_ASSIGN(LogToServer);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_LOG_TO_SERVER_H_