Me2me Native Messaging host on Windows: restructure NativeMessagingHost and NativeMessagingChannel.…

remoting/host/it2me/it2me_native_messaging_host.cc

 // 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.
 
 #include "remoting/host/it2me/it2me_native_messaging_host.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringize_macros.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
 #include "net/url_request/url_fetcher.h"
 #include "remoting/base/auth_token_util.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/host_exit_codes.h"
@@ skipping 32 matching lines @@
   bool xmpp_server_valid =
       net::ParseHostAndPort(service_urls->xmpp_server_address(),
                             &xmpp_server_config_.host,
                             &xmpp_server_config_.port);
   DCHECK(xmpp_server_valid);
 
   xmpp_server_config_.use_tls = service_urls->xmpp_server_use_tls();
   directory_bot_jid_ = service_urls->directory_bot_jid();
 }
 
-It2MeNativeMessagingHost::~It2MeNativeMessagingHost() {}
+It2MeNativeMessagingHost::~It2MeNativeMessagingHost() {
+  DCHECK(task_runner()->BelongsToCurrentThread());
+}
 
-void It2MeNativeMessagingHost::SetSendMessageCallback(
-    const SendMessageCallback& send_message) {
-  send_message_ = send_message;
+void It2MeNativeMessagingHost::Start(
+      base::PlatformFile input,
+      base::PlatformFile output,
+      const base::Closure& quit_closure) {
+  DCHECK(task_runner()->BelongsToCurrentThread());
+
+  // Set up the native messaging channel.
+  channel_.reset(
+      new NativeMessagingChannel(
+        base::Bind(&It2MeNativeMessagingHost::ProcessMessage, weak_ptr_),
+        input,
+        output));
+
+  quit_closure_ = quit_closure;
+  channel_->Start(base::Bind(&It2MeNativeMessagingHost::ShutDown, weak_ptr_));
 }
 
 void It2MeNativeMessagingHost::ProcessMessage(
     scoped_ptr<base::DictionaryValue> message) {
+  DCHECK(task_runner()->BelongsToCurrentThread());
+
   scoped_ptr<base::DictionaryValue> response(new base::DictionaryValue());
 
   // If the client supplies an ID, it will expect it in the response. This
   // might be a string or a number, so cope with both.
   const base::Value* id;
   if (message->Get("id", &id))
     response->Set("id", id->DeepCopy());
 
   std::string type;
   if (!message->GetString("type", &type)) {
@@ skipping 10 matching lines @@
   } else if (type == "disconnect") {
     ProcessDisconnect(*message, response.Pass());
   } else {
     SendErrorAndExit(response.Pass(), "Unsupported request type: " + type);
   }
 }
 
 void It2MeNativeMessagingHost::ProcessHello(
     const base::DictionaryValue& message,
     scoped_ptr<base::DictionaryValue> response) {
+  DCHECK(task_runner()->BelongsToCurrentThread());
+
   response->SetString("version", STRINGIZE(VERSION));
 
   // This list will be populated when new features are added.
   scoped_ptr<base::ListValue> supported_features_list(new base::ListValue());
   response->Set("supportedFeatures", supported_features_list.release());
 
-  send_message_.Run(response.Pass());
+  channel_->SendMessage(response.Pass());
 }
 
 void It2MeNativeMessagingHost::ProcessConnect(
     const base::DictionaryValue& message,
     scoped_ptr<base::DictionaryValue> response) {
+  DCHECK(task_runner()->BelongsToCurrentThread());
+
   if (it2me_host_.get()) {
     SendErrorAndExit(response.Pass(),
                      "Connect can be called only when disconnected.");
     return;
   }
 
   XmppSignalStrategy::XmppServerConfig xmpp_config = xmpp_server_config_;
 
   if (!message.GetString("userName", &xmpp_config.username)) {
     SendErrorAndExit(response.Pass(), "'userName' not found in request.");
@@ skipping 46 matching lines @@
 #endif  // !defined(NDEBUG)
 
   // Create the It2Me host and start connecting.
   it2me_host_ = factory_->CreateIt2MeHost(host_context_.get(),
                                           host_context_->ui_task_runner(),
                                           weak_ptr_,
                                           xmpp_config,
                                           directory_bot_jid_);
   it2me_host_->Connect();
 
-  send_message_.Run(response.Pass());
+  channel_->SendMessage(response.Pass());
 }
 
 void It2MeNativeMessagingHost::ProcessDisconnect(
     const base::DictionaryValue& message,
     scoped_ptr<base::DictionaryValue> response) {
+  DCHECK(task_runner()->BelongsToCurrentThread());
+
   if (it2me_host_.get()) {
     it2me_host_->Disconnect();
     it2me_host_ = NULL;
   }
-  send_message_.Run(response.Pass());
+  channel_->SendMessage(response.Pass());
 }
 
 void It2MeNativeMessagingHost::SendErrorAndExit(
     scoped_ptr<base::DictionaryValue> response,
     const std::string& description) {
+  DCHECK(task_runner()->BelongsToCurrentThread());
+
   LOG(ERROR) << description;
 
   response->SetString("type", "error");
   response->SetString("description", description);
-  send_message_.Run(response.Pass());
+  channel_->SendMessage(response.Pass());
 
   // Trigger a host shutdown by sending a NULL message.
-  send_message_.Run(scoped_ptr<base::DictionaryValue>());
+  channel_->SendMessage(scoped_ptr<base::DictionaryValue>());
 }
 
 void It2MeNativeMessagingHost::OnStateChanged(It2MeHostState state) {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
   state_ = state;
 
   scoped_ptr<base::DictionaryValue> message(new base::DictionaryValue());
 
   message->SetString("type", "hostStateChanged");
@@ skipping 12 matching lines @@
       break;
 
     case kDisconnected:
       client_username_.clear();
       break;
 
     default:
       ;
   }
 
-  send_message_.Run(message.Pass());
+  channel_->SendMessage(message.Pass());
 }
 
 void It2MeNativeMessagingHost::OnNatPolicyChanged(bool nat_traversal_enabled) {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
   scoped_ptr<base::DictionaryValue> message(new base::DictionaryValue());
 
   message->SetString("type", "natPolicyChanged");
   message->SetBoolean("natTraversalEnabled", nat_traversal_enabled);
-  send_message_.Run(message.Pass());
+  channel_->SendMessage(message.Pass());
 }
 
 // Stores the Access Code for the web-app to query.
 void It2MeNativeMessagingHost::OnStoreAccessCode(
     const std::string& access_code,
     base::TimeDelta access_code_lifetime) {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
   access_code_ = access_code;
   access_code_lifetime_ = access_code_lifetime;
 }
 
 // Stores the client user's name for the web-app to query.
 void It2MeNativeMessagingHost::OnClientAuthenticated(
     const std::string& client_username) {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
   client_username_ = client_username;
 }
 
 void It2MeNativeMessagingHost::ShutDown() {

[Sergey Ulanov, 2013/12/12 19:10:28]

Do you really need this method? I think you can just pass quit_closure_ to the
channel. it2me_host_->Disconnect() can be called in the destructor.

[weitao, 2013/12/12 23:33:48]

Done.

+  DCHECK(task_runner()->BelongsToCurrentThread());
+
   if (it2me_host_.get()) {
     it2me_host_->Disconnect();
     it2me_host_ = NULL;
   }
-  host_context_.reset();
+
+  if (!quit_closure_.is_null())
+    base::ResetAndReturn(&quit_closure_).Run();
 }
 
 scoped_refptr<AutoThreadTaskRunner> It2MeNativeMessagingHost::task_runner() {
   return host_context_->ui_task_runner();
 }
 
 /* static */
 std::string It2MeNativeMessagingHost::HostStateToString(
     It2MeHostState host_state) {
   return ValueToName(kIt2MeHostStates, host_state);
 }
 
 }  // namespace remoting