Index: remoting/protocol/connection_to_host.cc |
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc |
index 802d0107f10c9e268de839dfc600f330f54468ce..f8d471e47b7ef5a3114d2a54b62af5157673cc4e 100644 |
--- a/remoting/protocol/connection_to_host.cc |
+++ b/remoting/protocol/connection_to_host.cc |
@@ -32,7 +32,6 @@ ConnectionToHost::ConnectionToHost( |
pp::Instance* pp_instance, |
Wez
2012/05/02 22:32:33
Remove this parameter?
Sergey Ulanov
2012/05/11 19:39:36
Done.
|
bool allow_nat_traversal) |
: message_loop_(message_loop), |
- pp_instance_(pp_instance), |
Wez
2012/05/02 22:32:33
Ouch; isn't ConnectionToHost too generic to have P
Sergey Ulanov
2012/05/11 19:39:36
Maybe. We had some other pepper-specific code in /
|
allow_nat_traversal_(allow_nat_traversal), |
event_callback_(NULL), |
client_stub_(NULL), |
@@ -62,6 +61,7 @@ void ConnectionToHost::Connect(scoped_refptr<XmppProxy> xmpp_proxy, |
const std::string& local_jid, |
const std::string& host_jid, |
const std::string& host_public_key, |
+ scoped_ptr<TransportFactory> transport_factory, |
scoped_ptr<Authenticator> authenticator, |
HostEventCallback* event_callback, |
ClientStub* client_stub, |
@@ -84,10 +84,8 @@ void ConnectionToHost::Connect(scoped_refptr<XmppProxy> xmpp_proxy, |
signal_strategy_->AddListener(this); |
signal_strategy_->Connect(); |
- scoped_ptr<TransportFactory> transport_factory( |
- new PepperTransportFactory(pp_instance_)); |
session_manager_.reset(new JingleSessionManager( |
- transport_factory.Pass(), true)); |
+ transport_factory.Pass(), allow_nat_traversal_)); |
session_manager_->Init(signal_strategy_.get(), this); |
} |