Pass TransportConfig to TransportFactory instead of Transport.

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 "remoting/protocol/transport.h"
+#include "remoting/protocol/transport_config.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,
@@ skipping 20 matching lines @@
 
   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());
 
+  TransportConfig config;

[Wez, 2012/04/27 23:49:15]

nit: Move this below the comment, to immediately precede the setters below.

[Sergey Ulanov, 2012/04/28 00:18:19]

Done.

+
   // TODO(sergeyu): Add support for multiple STUN/relay servers when
   // it's implemented in libjingle and P2P Transport API.
-  transport_config_.stun_server = stun_hosts[0].ToString();
-  transport_config_.relay_server = relay_hosts[0];
-  transport_config_.relay_token = relay_token;
-  VLOG(1) << "STUN server: " << transport_config_.stun_server
-          << " Relay server: " << transport_config_.relay_server
-          << " Relay token: " << transport_config_.relay_token;
+  config.stun_server = stun_hosts[0].ToString();
+  config.relay_server = relay_hosts[0];
+  config.relay_token = relay_token;
+  VLOG(1) << "STUN server: " << config.stun_server
+          << " Relay server: " << config.relay_server
+          << " Relay token: " << config.relay_token;
+
+  transport_factory_->SetConfig(config);

[Wez, 2012/04/27 23:49:15]

nit: Move this to immediately follow the setters, so that the VLOG() is the
block on it's own, rather than breaking up the TransportConfig setting code.

[Sergey Ulanov, 2012/04/28 00:18:19]

Done.

 
   if (!ready_) {
     ready_ = true;
     listener_->OnSessionManagerReady();
   }
 }
 
 scoped_ptr<Session> JingleSessionManager::Connect(
     const std::string& host_jid,
     scoped_ptr<Authenticator> authenticator,
@@ skipping 117 matching lines @@
   signal_strategy_->SendStanza(
       JingleMessageReply(error).ToXml(original_stanza));
 }
 
 void JingleSessionManager::SessionDestroyed(JingleSession* session) {
   sessions_.erase(session->session_id_);
 }
 
 }  // namespace protocol
 }  // namespace remoting