It2Me native messaging: GYP and source refactoring

remoting/host/plugin/host_script_object.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/plugin/host_script_object.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_util.h"
@@ skipping 112 matching lines @@
 
   pairing_registry_ = CreatePairingRegistry(worker_thread_);
 }
 
 HostNPScriptObject::~HostNPScriptObject() {
   DCHECK(plugin_task_runner_->BelongsToCurrentThread());
 
   HostLogHandler::UnregisterLoggingScriptObject(this);
 
   // Stop the It2Me host if the caller forgot to.
-  if (it2me_impl_.get()) {
-    it2me_impl_->Disconnect();
-    it2me_impl_ = NULL;
+  if (it2me_host_.get()) {
+    it2me_host_->Disconnect();
+    it2me_host_ = NULL;
   }
 }
 
 bool HostNPScriptObject::HasMethod(const std::string& method_name) {
   VLOG(2) << "HasMethod " << method_name;
   DCHECK(plugin_task_runner_->BelongsToCurrentThread());
   return (method_name == kFuncNameConnect ||
           method_name == kFuncNameDisconnect ||
           method_name == kFuncNameLocalize ||
           method_name == kFuncNameClearPairedClients ||
@@ skipping 162 matching lines @@
 }
 
 bool HostNPScriptObject::SetProperty(const std::string& property_name,
                                      const NPVariant* value) {
   VLOG(2) <<  "SetProperty " << property_name;
   DCHECK(plugin_task_runner_->BelongsToCurrentThread());
 
   if (property_name == kAttrNameOnNatTraversalPolicyChanged) {
     if (NPVARIANT_IS_OBJECT(*value)) {
       on_nat_traversal_policy_changed_func_ = NPVARIANT_TO_OBJECT(*value);
-      if (it2me_impl_.get()) {
-        // Ask the It2Me implementation to notify the web-app of the policy.
-        it2me_impl_->RequestNatPolicy();
+      if (it2me_host_.get()) {
+        // Ask the It2Me host to notify the web-app of the policy.
+        it2me_host_->RequestNatPolicy();
       }
       return true;
     } else {
       SetException("SetProperty: unexpected type for property " +
                    property_name);
     }
     return false;
   }
 
   if (property_name == kAttrNameOnStateChanged) {
@@ skipping 116 matching lines @@
                                  NPVariant* result) {
   DCHECK(plugin_task_runner_->BelongsToCurrentThread());
 
   LOG(INFO) << "Connecting...";
 
   if (arg_count != 2) {
     SetException("connect: bad number of arguments");
     return false;
   }
 
-  if (it2me_impl_.get()) {
+  if (it2me_host_.get()) {
     SetException("connect: can be called only when disconnected");
     return false;
   }
 
   XmppSignalStrategy::XmppServerConfig xmpp_config = xmpp_server_config_;
 
   xmpp_config.username = StringFromNPVariant(args[0]);
   if (xmpp_config.username.empty()) {
     SetException("connect: bad username argument");
     return false;
   }
 
   std::string auth_service_with_token = StringFromNPVariant(args[1]);
   ParseAuthTokenWithService(auth_service_with_token, &xmpp_config.auth_token,
                             &xmpp_config.auth_service);
   if (xmpp_config.auth_token.empty()) {
     SetException("connect: auth_service_with_token argument has empty token");
     return false;
   }
 
   // Create threads for the Chromoting host & desktop environment to use.
   scoped_ptr<ChromotingHostContext> host_context =
     ChromotingHostContext::Create(plugin_task_runner_);
   if (!host_context) {
     SetException("connect: failed to start threads");
     return false;
   }
 
-  // Create the It2Me host implementation and start connecting.
-  it2me_impl_ = new It2MeImpl(
+  // Create the It2Me host and start connecting.
+  it2me_host_ = new It2MeHost(
       host_context.Pass(), plugin_task_runner_, weak_ptr_,
       xmpp_config, directory_bot_jid_);
-  it2me_impl_->Connect();
+  it2me_host_->Connect();
 
   return true;
 }
 
 bool HostNPScriptObject::Disconnect(const NPVariant* args,
                                     uint32_t arg_count,
                                     NPVariant* result) {
   DCHECK(plugin_task_runner_->BelongsToCurrentThread());
   if (arg_count != 0) {
     SetException("disconnect: bad number of arguments");
     return false;
   }
 
-  if (it2me_impl_.get()) {
-    it2me_impl_->Disconnect();
-    it2me_impl_ = NULL;
+  if (it2me_host_.get()) {
+    it2me_host_->Disconnect();
+    it2me_host_ = NULL;
   }
 
   return true;
 }
 
 bool HostNPScriptObject::Localize(const NPVariant* args,
                                   uint32_t arg_count,
                                   NPVariant* result) {
   DCHECK(plugin_task_runner_->BelongsToCurrentThread());
   if (arg_count != 1) {
@@ skipping 584 matching lines @@
 }
 
 void HostNPScriptObject::SetException(const std::string& exception_string) {
   DCHECK(plugin_task_runner_->BelongsToCurrentThread());
 
   g_npnetscape_funcs->setexception(parent_, exception_string.c_str());
   LOG(INFO) << exception_string;
 }
 
 }  // namespace remoting