Remote assistance on Chrome OS Part IV - It2MeHost

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/json/json_reader.h"
 #include "base/json/json_writer.h"
+#include "base/message_loop/message_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 "components/policy/core/common/policy_service.h"
 #include "net/base/net_util.h"
-#include "net/url_request/url_fetcher.h"
+#include "net/url_request/url_request_context_getter.h"
 #include "remoting/base/auth_token_util.h"
 #include "remoting/base/service_urls.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/host_exit_codes.h"
 #include "remoting/protocol/name_value_map.h"
 
 namespace remoting {
 
 namespace {
 
 const remoting::protocol::NameMapElement<It2MeHostState> kIt2MeHostStates[] = {
     {kDisconnected, "DISCONNECTED"},
     {kStarting, "STARTING"},
     {kRequestedAccessCode, "REQUESTED_ACCESS_CODE"},
     {kReceivedAccessCode, "RECEIVED_ACCESS_CODE"},
     {kConnected, "CONNECTED"},
     {kDisconnecting, "DISCONNECTING"},
     {kError, "ERROR"},
     {kInvalidDomainError, "INVALID_DOMAIN_ERROR"}, };
 
 }  // namespace
 
+// static
+scoped_ptr<extensions::NativeMessageHost>
+It2MeNativeMessagingHost::CreateForChromeOS(
+    scoped_refptr<net::URLRequestContextGetter> url_request_context_getter,
+    policy::PolicyService* policy_service) {
+
+  scoped_ptr<It2MeHostFactory> factory(new remoting::It2MeHostFactory());
+  scoped_ptr<ChromotingHostContext> context(
+      ChromotingHostContext::CreateForChromeOS(
+          // Remoting uses AutoThread as its threading primitive, which will
+          // exit itself (by posting a Quit message) when there are no more
+          // references to the task runner.
+          // On ChromeOS, the It2MeNativeMessagingHost is created on the UI
+          // thread of the browser process and its lifetime is explicitly
+          // managed by the browser process.  Therefore, base::DoNothing is
+          // passed in as the quit closure.
+          new AutoThreadTaskRunner(base::MessageLoopProxy::current(),
+                                   base::Bind(&base::DoNothing)),
+          url_request_context_getter,
+          policy_service));
+
+  scoped_ptr<extensions::NativeMessageHost> host(new It2MeNativeMessagingHost(
+      context.Pass(),
+      factory.Pass()));
+  return host.Pass();
+}
+
+scoped_ptr<extensions::NativeMessageHost> It2MeNativeMessagingHost::Create(

[Wez, 2014/10/17 17:58:01]

This is also // static

[kelvinp, 2014/10/20 00:21:18]

Done.

+    scoped_ptr<ChromotingHostContext> context,
+    scoped_ptr<It2MeHostFactory> factory) {
+  scoped_ptr<extensions::NativeMessageHost> host(new It2MeNativeMessagingHost(
+      context.Pass(),
+      factory.Pass()));

[Wez, 2014/10/17 17:58:01]

Why is this Create() method parameterized on It2MeHostFactory, but the one for
ChromeOS not?

Similarly, why does this version require a contet to be passed in, and the
ChromeOS version not? Why not always have it passed in, and fix the calling code
to do the dirty work of creating it, rather than polluting this class?

[kelvinp, 2014/10/20 00:21:18]

Good Idea.  In this case, I can simply get rid of the create function.

+  return host.Pass();
+}
+
+
 It2MeNativeMessagingHost::It2MeNativeMessagingHost(
-    scoped_refptr<AutoThreadTaskRunner> task_runner,
+    scoped_ptr<ChromotingHostContext> context,
     scoped_ptr<It2MeHostFactory> factory)
     : client_(NULL),
       factory_(factory.Pass()),
       weak_factory_(this) {
   weak_ptr_ = weak_factory_.GetWeakPtr();
 
-  // Initialize the host context to manage the threads for the it2me host.
-  // The native messaging host, rather than the It2MeHost object, owns and
-  // maintains the lifetime of the host context.
-
-  host_context_.reset(ChromotingHostContext::Create(task_runner).release());
+  host_context_ = context.Pass();
+  task_runner_ = host_context_->ui_task_runner();
 
   const ServiceUrls* service_urls = ServiceUrls::GetInstance();
   const 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();
@@ skipping 231 matching lines @@
 // 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;
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 It2MeNativeMessagingHost::task_runner() const {
-  return host_context_->ui_task_runner();
+  return task_runner_;
 }
 
 /* static */
 std::string It2MeNativeMessagingHost::HostStateToString(
     It2MeHostState host_state) {
   return ValueToName(kIt2MeHostStates, host_state);
 }
 
 }  // namespace remoting