Move PortAllocator creation out of LibjingleTransportFactory.

remoting/protocol/jingle_session_manager.cc

 // Copyright (c) 2012 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/jingle_session_manager.h"
 
 #include "base/bind.h"
 #include "remoting/jingle_glue/iq_sender.h"
 #include "remoting/jingle_glue/jingle_info_request.h"
 #include "remoting/jingle_glue/signal_strategy.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/content_description.h"
 #include "remoting/protocol/jingle_messages.h"
 #include "remoting/protocol/jingle_session.h"
 #include "third_party/libjingle/source/talk/base/socketaddress.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
 using buzz::QName;
 
 namespace remoting {
 namespace protocol {
 
 JingleSessionManager::JingleSessionManager(
-    scoped_ptr<TransportFactory> transport_factory)
+    scoped_ptr<TransportFactory> transport_factory,
+    bool fetch_nat_traversal_config)
     : transport_factory_(transport_factory.Pass()),
+      fetch_nat_traversal_config_(fetch_nat_traversal_config),
       signal_strategy_(NULL),
       listener_(NULL),
       ready_(false) {
 }
 
 JingleSessionManager::~JingleSessionManager() {
   Close();
 }
 
 void JingleSessionManager::Init(
     SignalStrategy* signal_strategy,
-    SessionManager::Listener* listener,
-    const NetworkSettings& network_settings) {
+    SessionManager::Listener* listener) {
   listener_ = listener;
   signal_strategy_ = signal_strategy;
   iq_sender_.reset(new IqSender(signal_strategy_));
 
-  transport_config_.nat_traversal_mode = network_settings.nat_traversal_mode;
-  transport_config_.min_port = network_settings.min_port;
-  transport_config_.max_port = network_settings.max_port;
-
   signal_strategy_->AddListener(this);
 
   OnSignalStrategyStateChange(signal_strategy_->GetState());
 }
 
 void JingleSessionManager::OnJingleInfo(
     const std::string& relay_token,
     const std::vector<std::string>& relay_hosts,
     const std::vector<talk_base::SocketAddress>& stun_hosts) {
   DCHECK(CalledOnValidThread());
@@ skipping 41 matching lines @@
 }
 
 void JingleSessionManager::set_authenticator_factory(
     scoped_ptr<AuthenticatorFactory> authenticator_factory) {
   DCHECK(CalledOnValidThread());
   authenticator_factory_ = authenticator_factory.Pass();
 }
 
 void JingleSessionManager::OnSignalStrategyStateChange(
     SignalStrategy::State state) {
-  // If NAT traversal is enabled then we need to request STUN/Relay info.
   if (state == SignalStrategy::CONNECTED) {
-    if (transport_config_.nat_traversal_mode ==
-        TransportConfig::NAT_TRAVERSAL_ENABLED) {
+    // Request STUN/Relay info if necessary.
+    if (fetch_nat_traversal_config_) {
       jingle_info_request_.reset(new JingleInfoRequest(signal_strategy_));
       jingle_info_request_->Send(base::Bind(&JingleSessionManager::OnJingleInfo,
                                             base::Unretained(this)));
     } else if (!ready_) {
       ready_ = true;
       listener_->OnSessionManagerReady();
     }
   }
 }
 
@@ skipping 72 matching lines @@
   signal_strategy_->SendStanza(
       JingleMessageReply(error).ToXml(original_stanza));
 }
 
 void JingleSessionManager::SessionDestroyed(JingleSession* session) {
   sessions_.erase(session->session_id_);
 }
 
 }  // namespace protocol
 }  // namespace remoting