Chromium Code Reviews| Index: remoting/protocol/connection_to_host.cc |
| diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc |
| index 845280866b29c28fdb22c8bbf86267833b96e5eb..224c79ae67621d6729e731b21abd65fd2f5fb6ac 100644 |
| --- a/remoting/protocol/connection_to_host.cc |
| +++ b/remoting/protocol/connection_to_host.cc |
| @@ -29,17 +29,9 @@ namespace protocol { |
| ConnectionToHost::ConnectionToHost( |
| base::MessageLoopProxy* message_loop, |
| pp::Instance* pp_instance, |
| - 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), |
| pp_instance_(pp_instance), |
| - 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), |
| event_callback_(NULL), |
| client_stub_(NULL), |
| @@ -112,20 +104,7 @@ void ConnectionToHost::InitSession() { |
| DCHECK(message_loop_->BelongsToCurrentThread()); |
| // Initialize |session_manager_|. |
|
Wez
2011/09/22 13:49:45
nit: This code is now so beautifully simple that t
Sergey Ulanov
2011/09/22 18:12:00
Done.
|
| - if (pp_instance_) { |
| - session_manager_.reset(new PepperSessionManager(pp_instance_)); |
| - } else { |
| - JingleSessionManager* session_manager = |
| - JingleSessionManager::CreateSandboxed( |
| - message_loop_, 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_.reset(new PepperSessionManager(pp_instance_)); |
| session_manager_->Init( |
| local_jid_, signal_strategy_.get(), this, NULL, "", allow_nat_traversal_); |