Pull out common code from client and host versions of LogToServer

remoting/host/it2me/it2me_host.h

 // Copyright 2013 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_IT2ME_IT2ME_HOST_H_
 #define REMOTING_HOST_IT2ME_IT2ME_HOST_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
-#include "remoting/host/log_to_server.h"
+#include "remoting/host/host_status_observer.h"
 #include "remoting/jingle_glue/xmpp_signal_strategy.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace remoting {
 
 class ChromotingHost;
 class ChromotingHostContext;
 class DesktopEnvironmentFactory;
 class HostEventLogger;
 class HostNPScriptObject;
+class LogToServerHost;
 class RegisterSupportHostRequest;
 class RsaKeyPair;
 
 namespace policy_hack {
 
 class PolicyWatcher;
 
 }  // namespace policy_hack
 
 // These state values are duplicated in host_session.js. Remember to update
 // both copies when making changes.
 enum It2MeHostState {
   kDisconnected,
   kStarting,
   kRequestedAccessCode,
   kReceivedAccessCode,
   kConnected,
   kDisconnecting,
   kError,
   kInvalidDomainError
 };
 
 // Internal implementation of the plugin's It2Me host function.
-class It2MeHost
-    : public base::RefCountedThreadSafe<It2MeHost>,
-      public HostStatusObserver {
+class It2MeHost : public base::RefCountedThreadSafe<It2MeHost>,
+                  public HostStatusObserver {
  public:
-
   class Observer {
    public:
     virtual void OnClientAuthenticated(const std::string& client_username) = 0;
     virtual void OnStoreAccessCode(const std::string& access_code,
                                    base::TimeDelta access_code_lifetime) = 0;
     virtual void OnNatPolicyChanged(bool nat_traversal_enabled) = 0;
     virtual void OnStateChanged(It2MeHostState state) = 0;
   };
 
   It2MeHost(
@@ skipping 75 matching lines @@
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   base::WeakPtr<It2MeHost::Observer> observer_;
   XmppSignalStrategy::XmppServerConfig xmpp_server_config_;
   std::string directory_bot_jid_;
 
   It2MeHostState state_;
 
   scoped_refptr<RsaKeyPair> host_key_pair_;
   scoped_ptr<SignalStrategy> signal_strategy_;
   scoped_ptr<RegisterSupportHostRequest> register_request_;
-  scoped_ptr<LogToServer> log_to_server_;
+  scoped_ptr<LogToServerHost> log_to_server_;
   scoped_ptr<DesktopEnvironmentFactory> desktop_environment_factory_;
   scoped_ptr<HostEventLogger> host_event_logger_;
 
   scoped_ptr<ChromotingHost> host_;
   int failed_login_attempts_;
 
   scoped_ptr<policy_hack::PolicyWatcher> policy_watcher_;
 
   // Host the current nat traversal policy setting.
   bool nat_traversal_enabled_;
@@ skipping 29 matching lines @@
       const XmppSignalStrategy::XmppServerConfig& xmpp_server_config,
       const std::string& directory_bot_jid);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(It2MeHostFactory);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_IT2ME_IT2ME_HOST_H_