| Index: remoting/protocol/connection_to_host.cc
|
| diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc
|
| index 580f1984fbc290e80bcffd8a345d3a41ac5b9e3d..fe4def66f350f53037155b5bdfb36dec011626a2 100644
|
| --- a/remoting/protocol/connection_to_host.cc
|
| +++ b/remoting/protocol/connection_to_host.cc
|
| @@ -8,6 +8,7 @@
|
| #include "base/callback.h"
|
| #include "base/message_loop.h"
|
| #include "remoting/base/constants.h"
|
| +#include "remoting/jingle_glue/host_address_resolver.h"
|
| #include "remoting/jingle_glue/http_port_allocator.h"
|
| #include "remoting/jingle_glue/javascript_signal_strategy.h"
|
| #include "remoting/jingle_glue/xmpp_signal_strategy.h"
|
| @@ -28,11 +29,13 @@ ConnectionToHost::ConnectionToHost(
|
| MessageLoop* message_loop,
|
| talk_base::NetworkManager* network_manager,
|
| talk_base::PacketSocketFactory* socket_factory,
|
| + HostAddressResolver* host_address_resolver,
|
| PortAllocatorSessionFactory* session_factory,
|
| bool allow_nat_traversal)
|
| : message_loop_(message_loop),
|
| network_manager_(network_manager),
|
| socket_factory_(socket_factory),
|
| + host_address_resolver_(host_address_resolver),
|
| port_allocator_session_factory_(session_factory),
|
| allow_nat_traversal_(allow_nat_traversal),
|
| state_(STATE_EMPTY),
|
| @@ -107,6 +110,7 @@ void ConnectionToHost::InitSession() {
|
| JingleSessionManager* session_manager =
|
| JingleSessionManager::CreateSandboxed(
|
| network_manager_.release(), socket_factory_.release(),
|
| + host_address_resolver_.release(),
|
| port_allocator_session_factory_.release());
|
|
|
| // TODO(ajwong): Make this a command switch when we're more stable.
|
|
|