Resolve addresses of STUN/Relay servers in JingleInfoRequest.

remoting/protocol/connection_to_host.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/connection_to_host.h"
 
 #include "base/bind.h"
 #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"
 #include "remoting/protocol/auth_token_utils.h"
 #include "remoting/protocol/client_message_dispatcher.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/host_control_sender.h"
 #include "remoting/protocol/input_sender.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/video_reader.h"
 #include "remoting/protocol/video_stub.h"
 #include "remoting/protocol/util.h"
 
 namespace remoting {
 namespace protocol {
 
 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),
       event_callback_(NULL),
       dispatcher_(new ClientMessageDispatcher()),
       client_stub_(NULL),
       video_stub_(NULL) {
 }
 
 ConnectionToHost::~ConnectionToHost() {
@@ skipping 54 matching lines @@
   shutdown_task.Run();
 }
 
 void ConnectionToHost::InitSession() {
   DCHECK_EQ(message_loop_, MessageLoop::current());
 
   // Initialize chromotocol |session_manager_|.
   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.
   session_manager->set_allow_local_ips(true);
 
   session_manager_.reset(session_manager);
   session_manager_->Init(
       local_jid_, signal_strategy_.get(), this, NULL, "", allow_nat_traversal_);
 }
 
@@ skipping 95 matching lines @@
   // Create and enable the input stub now that we're authenticated.
   input_sender_.reset(new InputSender(session_->event_channel()));
 }
 
 ConnectionToHost::State ConnectionToHost::state() const {
   return state_;
 }
 
 }  // namespace protocol
 }  // namespace remoting