Index: remoting/host/remoting_me2me_host.cc |
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc |
index 30d44dc7edc94b0a5f7a744ad5d6ae56bc326c2b..dadfc4b769267c1ba82f99453f01f6fe59a0baef 100644 |
--- a/remoting/host/remoting_me2me_host.cc |
+++ b/remoting/host/remoting_me2me_host.cc |
@@ -33,6 +33,7 @@ |
#include "remoting/host/host_config.h" |
#include "remoting/host/host_event_logger.h" |
#include "remoting/host/host_user_interface.h" |
+#include "remoting/host/jingle_session_manager_factory.h" |
#include "remoting/host/json_host_config.h" |
#include "remoting/host/log_to_server.h" |
#include "remoting/host/policy_hack/nat_policy.h" |
@@ -371,6 +372,9 @@ class HostProcess |
DesktopEnvironment::CreateForService(context_.get()); |
} |
+ scoped_ptr<SessionManagerFactory> session_manager_factory( |
+ new JingleSessionManagerFactory()); |
+ |
NetworkSettings network_settings( |
allow_nat_traversal_ ? |
NetworkSettings::NAT_TRAVERSAL_ENABLED : |
@@ -382,7 +386,7 @@ class HostProcess |
host_ = new ChromotingHost( |
context_.get(), signal_strategy_.get(), desktop_environment_.get(), |
- network_settings); |
+ session_manager_factory.Pass(), network_settings); |
Wez
2012/06/11 22:17:06
Pass the new object directly here?
simonmorris
2012/06/11 23:08:59
Done.
|
heartbeat_sender_.reset(new HeartbeatSender( |
this, host_id_, signal_strategy_.get(), &key_pair_)); |