Revert of 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/strings/string_number_conversions.h"
 #include "base/strings/stringize_macros.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
-#include "media/base/media.h"
 #include "net/base/net_util.h"
-#include "net/url_request/url_request_context_getter.h"
+#include "net/url_request/url_fetcher.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"},
-};
+    {kInvalidDomainError, "INVALID_DOMAIN_ERROR"}, };
 
 }  // namespace
 
 It2MeNativeMessagingHost::It2MeNativeMessagingHost(
-    scoped_ptr<ChromotingHostContext> context,
+    scoped_refptr<AutoThreadTaskRunner> task_runner,
     scoped_ptr<It2MeHostFactory> factory)
     : client_(NULL),
-      host_context_(context.Pass()),
       factory_(factory.Pass()),
       weak_factory_(this) {
   weak_ptr_ = weak_factory_.GetWeakPtr();
 
-  // Ensures runtime specific CPU features are initialized.
-  media::InitializeCPUSpecificMediaFeatures();
+  // 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());
 
   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 131 matching lines @@
   }
 
   if (!message.GetString("directoryBotJid", &directory_bot_jid_)) {
     SendErrorAndExit(response.Pass(),
                      "'directoryBotJid' not found in request.");
     return;
   }
 #endif  // !defined(NDEBUG)
 
   // Create the It2Me host and start connecting.
-  it2me_host_ = factory_->CreateIt2MeHost(host_context_->Copy(),
+  it2me_host_ = factory_->CreateIt2MeHost(host_context_.get(),
+                                          host_context_->ui_task_runner(),
                                           weak_ptr_,
                                           xmpp_config,
                                           directory_bot_jid_);
   it2me_host_->Connect();
 
   SendMessageToClient(response.Pass());
 }
 
 void It2MeNativeMessagingHost::ProcessDisconnect(
     const base::DictionaryValue& message,
@@ skipping 89 matching lines @@
 }
 
 /* static */
 std::string It2MeNativeMessagingHost::HostStateToString(
     It2MeHostState host_state) {
   return ValueToName(kIt2MeHostStates, host_state);
 }
 
 }  // namespace remoting