| Index: remoting/client/plugin/pepper_port_allocator.cc
|
| diff --git a/remoting/client/plugin/pepper_port_allocator.cc b/remoting/client/plugin/pepper_port_allocator.cc
|
| index a601480b14e1f86b38951b0c02d35567bb0f8550..11fee0757ddca2bbadddb6f53bd2b4dc18511988 100644
|
| --- a/remoting/client/plugin/pepper_port_allocator.cc
|
| +++ b/remoting/client/plugin/pepper_port_allocator.cc
|
| @@ -225,17 +225,9 @@ PepperPortAllocator::PepperPortAllocator(
|
| instance_(instance),
|
| network_manager_(network_manager.Pass()),
|
| socket_factory_(socket_factory.Pass()) {
|
| - // TCP transport is disabled becase PseudoTCP works poorly over
|
| - // it. ENABLE_SHARED_UFRAG flag is specified so that the same
|
| - // username fragment is shared between all candidates for this
|
| - // channel.
|
| - set_flags(cricket::PORTALLOCATOR_DISABLE_TCP |
|
| - cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG|
|
| - cricket::PORTALLOCATOR_ENABLE_IPV6);
|
| }
|
|
|
| -PepperPortAllocator::~PepperPortAllocator() {
|
| -}
|
| +PepperPortAllocator::~PepperPortAllocator() {}
|
|
|
| cricket::PortAllocatorSession* PepperPortAllocator::CreateSessionInternal(
|
| const std::string& content_name,
|
| @@ -247,4 +239,15 @@ cricket::PortAllocatorSession* PepperPortAllocator::CreateSessionInternal(
|
| stun_hosts(), relay_hosts(), relay_token(), instance_);
|
| }
|
|
|
| +PepperPortAllocatorFactory::PepperPortAllocatorFactory(
|
| + const pp::InstanceHandle& instance)
|
| + : instance_(instance) {}
|
| +
|
| +PepperPortAllocatorFactory::~PepperPortAllocatorFactory() {}
|
| +
|
| +scoped_ptr<cricket::HttpPortAllocatorBase>
|
| +PepperPortAllocatorFactory::CreatePortAllocator() {
|
| + return PepperPortAllocator::Create(instance_);
|
| +}
|
| +
|
| } // namespace remoting
|
|
|