[Chromoting] Make ChromotingHost's dependency on libjingle injected, instead of hard-coded.

remoting/host/plugin/host_script_object.cc

Index: remoting/host/plugin/host_script_object.cc
diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc
index 91587520b453f7a6749128615c14a4faee1fd144..f8397d619f0809f4552d8a69e34d73fdf2650565 100644
--- a/remoting/host/plugin/host_script_object.cc
+++ b/remoting/host/plugin/host_script_object.cc
@@ -22,6 +22,7 @@
 #include "remoting/host/host_key_pair.h"
 #include "remoting/host/host_secret.h"
 #include "remoting/host/it2me_host_user_interface.h"
+#include "remoting/host/jingle_session_manager_factory.h"
 #include "remoting/host/pin_hash.h"
 #include "remoting/host/plugin/daemon_controller.h"
 #include "remoting/host/plugin/host_log_handler.h"
@@ -553,10 +554,15 @@ void HostNPScriptObject::FinishConnectNetworkThread(
   signal_strategy_.reset(signal_strategy.release());
   register_request_.reset(register_request.release());
 
+  // Create the session manager factory.

[Wez, 2012/06/11 22:17:06]

nit: Suggest e.g. "Create a SessionManagerFactory that uses Jingle on Chrome's
network stack".

[simonmorris, 2012/06/11 23:08:59]

Removed code.

+  scoped_ptr<SessionManagerFactory> session_manager_factory(
+      new JingleSessionManagerFactory());
+
   // Create the Host.
   LOG(INFO) << "NAT state: " << nat_traversal_enabled_;
   host_ = new ChromotingHost(
       host_context_.get(), signal_strategy_.get(), desktop_environment_.get(),
+      session_manager_factory.Pass(),

[Wez, 2012/06/11 22:17:06]

Do you need to assign to a local & Pass(), or could you just pass the new object
directly?

[simonmorris, 2012/06/11 23:08:59]

Done.

       NetworkSettings(nat_traversal_enabled_ ?
                       NetworkSettings::NAT_TRAVERSAL_ENABLED :
                       NetworkSettings::NAT_TRAVERSAL_DISABLED));