Index: remoting/host/it2me/it2me_host.cc |
diff --git a/remoting/host/it2me/it2me_host.cc b/remoting/host/it2me/it2me_host.cc |
index ed1ce1c52ee8a9c48192de6fdfb65fc657043690..0ecec5ba7e8de1a834942569d2745ccea24300d8 100644 |
--- a/remoting/host/it2me/it2me_host.cc |
+++ b/remoting/host/it2me/it2me_host.cc |
@@ -9,6 +9,7 @@ |
#include "base/strings/string_util.h" |
#include "base/threading/platform_thread.h" |
#include "net/socket/client_socket_factory.h" |
+#include "net/url_request/url_request_context_getter.h" |
#include "policy/policy_constants.h" |
#include "remoting/base/auto_thread.h" |
#include "remoting/base/logging.h" |
@@ -22,9 +23,12 @@ |
#include "remoting/host/it2me_desktop_environment.h" |
#include "remoting/host/policy_watcher.h" |
#include "remoting/host/register_support_host_request.h" |
-#include "remoting/host/session_manager_factory.h" |
+#include "remoting/protocol/chromium_port_allocator.h" |
+#include "remoting/protocol/ice_transport.h" |
#include "remoting/protocol/it2me_host_authenticator_factory.h" |
+#include "remoting/protocol/jingle_session_manager.h" |
#include "remoting/protocol/network_settings.h" |
+#include "remoting/protocol/transport_context.h" |
#include "remoting/signaling/server_log_entry.h" |
namespace remoting { |
@@ -227,9 +231,16 @@ void It2MeHost::FinishConnect() { |
protocol::NetworkSettings::kDefaultMaxPort; |
} |
- scoped_ptr<protocol::SessionManager> session_manager = |
- CreateHostSessionManager(signal_strategy_.get(), network_settings, |
- host_context_->url_request_context_getter()); |
+ scoped_ptr<protocol::TransportFactory> transport_factory( |
+ new protocol::IceTransportFactory(new protocol::TransportContext( |
+ signal_strategy_.get(), |
+ make_scoped_ptr(new protocol::ChromiumPortAllocatorFactory( |
+ host_context_->url_request_context_getter())), |
+ network_settings, protocol::TransportRole::SERVER))); |
+ |
+ scoped_ptr<protocol::SessionManager> session_manager( |
+ new protocol::JingleSessionManager(transport_factory.Pass())); |
+ |
scoped_ptr<protocol::CandidateSessionConfig> protocol_config = |
protocol::CandidateSessionConfig::CreateDefault(); |
// Disable audio by default. |