Move signaling connection creation out of ChromotingHost.

remoting/host/plugin/host_script_object.cc

 // Copyright (c) 2011 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/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/sys_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
+#include "remoting/jingle_glue/xmpp_signal_strategy.h"
 #include "remoting/base/auth_token_util.h"
 #include "remoting/host/chromoting_host.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/host_config.h"
 #include "remoting/host/host_key_pair.h"
 #include "remoting/host/host_secret.h"
 #include "remoting/host/in_memory_host_config.h"
 #include "remoting/host/it2me_host_user_interface.h"
 #include "remoting/host/plugin/host_log_handler.h"
@@ skipping 307 matching lines @@
     kAttrNameConnected,
     kAttrNameDisconnecting,
     kAttrNameError
   };
   for (size_t i = 0; i < arraysize(entries); ++i) {
     values->push_back(entries[i]);
   }
   return true;
 }
 
-void HostNPScriptObject::OnSignallingConnected(
-    SignalStrategy* signal_strategy) {
-}
-
-void HostNPScriptObject::OnSignallingDisconnected() {
-}
-
 void HostNPScriptObject::OnAccessDenied() {
   DCHECK(host_context_.network_message_loop()->BelongsToCurrentThread());
 
   ++failed_login_attempts_;
   if (failed_login_attempts_ == kMaxLoginAttempts)
     DisconnectInternal();
 }
 
 void HostNPScriptObject::OnClientAuthenticated(const std::string& jid) {
   if (MessageLoop::current() != host_context_.main_message_loop()) {
@@ skipping 111 matching lines @@
     const std::string& uid,
     const std::string& auth_token,
     const std::string& auth_service) {
   DCHECK_EQ(MessageLoop::current(), host_context_.main_message_loop());
 
   if (state_ != kStarting) {
     // Host has been stopped while we were fetching policy.
     return;
   }
 
-  // Store the supplied user ID and token to the Host configuration.
   scoped_refptr<MutableHostConfig> host_config = new InMemoryHostConfig();
-  host_config->SetString(kXmppLoginConfigPath, uid);
-  host_config->SetString(kXmppAuthTokenConfigPath, auth_token);
-  host_config->SetString(kXmppAuthServiceConfigPath, auth_service);
 
   // Generate a key pair for the Host to use.
   // TODO(wez): Move this to the worker thread.
   HostKeyPair host_key_pair;
   host_key_pair.Generate();
   host_key_pair.Save(host_config);
 
+  // Create and start XMPP connection.
+  scoped_ptr<SignalStrategy> signal_strategy(
+      new XmppSignalStrategy(host_context_.jingle_thread(), uid,
+                             auth_token, auth_service));
+
   // Request registration of the host for support.
   scoped_ptr<RegisterSupportHostRequest> register_request(
       new RegisterSupportHostRequest());
   if (!register_request->Init(
+          signal_strategy.get(),
           host_config.get(),
           base::Bind(&HostNPScriptObject::OnReceivedSupportID,
                      base::Unretained(this)))) {
     SetState(kError);
     return;
   }
 
   // Create DesktopEnvironment.
   desktop_environment_.reset(DesktopEnvironment::Create(&host_context_));
   if (desktop_environment_.get() == NULL) {
     SetState(kError);
     return;
   }
 
-  // Beyond this point nothing can fail, so save the config and request.
+  // Beyond this point nothing can fail,xs so save the config and request.

[Wez, 2012/01/03 16:25:04]

typo: xs

[Sergey Ulanov, 2012/01/03 21:51:02]

Done.

   host_config_ = host_config;
+  signal_strategy_.reset(signal_strategy.release());
   register_request_.reset(register_request.release());
 
   // Create the Host.
   LOG(INFO) << "NAT state: " << nat_traversal_enabled_;
-  host_ = ChromotingHost::Create(
-      &host_context_, host_config_, desktop_environment_.get(),
-      nat_traversal_enabled_);
+  host_ = new ChromotingHost(
+      &host_context_, host_config_, signal_strategy_.get(),
+      desktop_environment_.get(), nat_traversal_enabled_);
   host_->AddStatusObserver(this);
-  host_->AddStatusObserver(register_request_.get());
   if (enable_log_to_server_) {
-    log_to_server_.reset(new LogToServer(host_context_.network_message_loop()));
+    log_to_server_.reset(new LogToServer(signal_strategy_.get()));
     host_->AddStatusObserver(log_to_server_.get());
   }
   host_->set_it2me(true);
   it2me_host_user_interface_.reset(new It2MeHostUserInterface(host_.get(),
                                                               &host_context_));
   it2me_host_user_interface_->Init();
   host_->AddStatusObserver(it2me_host_user_interface_.get());
 
   {
     base::AutoLock auto_lock(ui_strings_lock_);
     host_->SetUiStrings(ui_strings_);
   }
 
+  // Post a task to start XMPP connection.
+  host_context_.network_message_loop()->PostTask(
+      FROM_HERE, base::Bind(&SignalStrategy::Connect,
+                            base::Unretained(signal_strategy_.get())));
+
   // Start the Host.
   host_->Start();
 
   SetState(kRequestedAccessCode);
   return;
 }
 
 bool HostNPScriptObject::Disconnect(const NPVariant* args,
                                     uint32_t arg_count,
                                     NPVariant* result) {
@@ skipping 298 matching lines @@
                                                uint32_t argCount) {
   NPVariant np_result;
   bool is_good = g_npnetscape_funcs->invokeDefault(plugin_, func, args,
                                                    argCount, &np_result);
   if (is_good)
       g_npnetscape_funcs->releasevariantvalue(&np_result);
   return is_good;
 }
 
 }  // namespace remoting