It2Me native messaging: GYP and source refactoring

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_IMPL_H_
-#define REMOTING_HOST_IT2ME__IT2ME_IMPL_H_
+#ifndef REMOTING_HOST_IT2ME_IT2ME_HOST_H_
+#define REMOTING_HOST_IT2ME_IT2ME_HOST_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "remoting/host/log_to_server.h"
 #include "remoting/jingle_glue/xmpp_signal_strategy.h"
 
 namespace remoting {
 
 class RegisterSupportHostRequest;
@@ skipping 16 matching lines @@
   kStarting,
   kRequestedAccessCode,
   kReceivedAccessCode,
   kConnected,
   kDisconnecting,
   kError,
   kInvalidDomainError
 };
 
 // Internal implementation of the plugin's It2Me host function.
-class It2MeImpl
-    : public base::RefCountedThreadSafe<It2MeImpl>,
+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;
   };
 
-  It2MeImpl(
+  It2MeHost(
       scoped_ptr<ChromotingHostContext> context,
       scoped_refptr<base::SingleThreadTaskRunner> plugin_task_runner,
-      base::WeakPtr<It2MeImpl::Observer> observer,
+      base::WeakPtr<It2MeHost::Observer> observer,
       const XmppSignalStrategy::XmppServerConfig& xmpp_server_config,
       const std::string& directory_bot_jid);
 
   // Methods called by the script object, from the plugin thread.
 
   // Creates It2Me host structures and starts the host.
   void Connect();
 
   // Disconnects the host, ready for tear-down.
   // Also called internally, from the network thread.
   void Disconnect();
 
   // Request a NAT policy notification.
   void RequestNatPolicy();
 
   // remoting::HostStatusObserver implementation.
   virtual void OnAccessDenied(const std::string& jid) OVERRIDE;
   virtual void OnClientAuthenticated(const std::string& jid) OVERRIDE;
   virtual void OnClientDisconnected(const std::string& jid) OVERRIDE;
 
  private:
-  friend class base::RefCountedThreadSafe<It2MeImpl>;
+  friend class base::RefCountedThreadSafe<It2MeHost>;
 
-  virtual ~It2MeImpl();
+  virtual ~It2MeHost();
 
   // Updates state of the host. Can be called only on the network thread.
   void SetState(It2MeHostState state);
 
   // Returns true if the host is connected.
   bool IsConnected() const;
 
   // Called by Connect() to check for policies and start connection process.
   void ReadPolicyAndConnect();
 
@@ skipping 16 matching lines @@
   // Called when initial policies are read, and when they change.
   void OnPolicyUpdate(scoped_ptr<base::DictionaryValue> policies);
 
   // Handlers for NAT traversal and host domain policies.
   void UpdateNatPolicy(bool nat_traversal_enabled);
   void UpdateHostDomainPolicy(const std::string& host_domain);
 
   // Caller supplied fields.
   scoped_ptr<ChromotingHostContext> host_context_;
   scoped_refptr<base::SingleThreadTaskRunner> plugin_task_runner_;
-  base::WeakPtr<It2MeImpl::Observer> observer_;
+  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<DesktopEnvironmentFactory> desktop_environment_factory_;
@@ skipping 14 matching lines @@
   // that on startup, we do not accidentally start a connection before we have
   // queried our policy restrictions.
   bool policy_received_;
 
   // On startup, it is possible to have Connect() called before the policy read
   // is completed.  Rather than just failing, we thunk the connection call so
   // it can be executed after at least one successful policy read. This
   // variable contains the thunk if it is necessary.
   base::Closure pending_connect_;
 
-  DISALLOW_COPY_AND_ASSIGN(It2MeImpl);
+  DISALLOW_COPY_AND_ASSIGN(It2MeHost);
 };
 
 }  // namespace remoting
 
-#endif  // REMOTING_HOST_IT2ME__IT2ME_IMPL_H_
+#endif  // REMOTING_HOST_IT2ME_IT2ME_HOST_H_