Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(374)

Unified Diff: remoting/protocol/connection_to_host.cc

Issue 7598004: Resolve addresses of STUN/Relay servers in JingleInfoRequest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/connection_to_host.h ('k') | remoting/protocol/jingle_session_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..26dca8b2a63e799a33156fd2d6c5beecf58d3ac6 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_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,
+ HostResolverFactory* host_resolver_factory,
PortAllocatorSessionFactory* session_factory,
bool allow_nat_traversal)
: message_loop_(message_loop),
network_manager_(network_manager),
socket_factory_(socket_factory),
+ host_resolver_factory_(host_resolver_factory),
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_resolver_factory_.release(),
port_allocator_session_factory_.release());
// TODO(ajwong): Make this a command switch when we're more stable.
« no previous file with comments | « remoting/protocol/connection_to_host.h ('k') | remoting/protocol/jingle_session_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698