| Index: remoting/protocol/chromium_port_allocator_factory.h
|
| diff --git a/remoting/protocol/chromium_port_allocator_factory.h b/remoting/protocol/chromium_port_allocator_factory.h
|
| index 4c7db572a3bd0ef6b6fb4bcb2f4eaddec408eee3..bbfa1b7f838052b8e7f6dd97eba6b79ed0412458 100644
|
| --- a/remoting/protocol/chromium_port_allocator_factory.h
|
| +++ b/remoting/protocol/chromium_port_allocator_factory.h
|
| @@ -7,9 +7,8 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "remoting/protocol/network_settings.h"
|
| -#include "remoting/protocol/port_allocator_factory.h"
|
| +#include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h"
|
|
|
| namespace net {
|
| class URLRequestContextGetter;
|
| @@ -18,14 +17,17 @@
|
| namespace remoting {
|
| namespace protocol {
|
|
|
| -class ChromiumPortAllocatorFactory : public PortAllocatorFactory {
|
| +class ChromiumPortAllocatorFactory
|
| + : public webrtc::PortAllocatorFactoryInterface {
|
| public:
|
| - static scoped_ptr<PortAllocatorFactory> Create(
|
| + static rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface> Create(
|
| const NetworkSettings& network_settings,
|
| scoped_refptr<net::URLRequestContextGetter> url_request_context_getter);
|
|
|
| - // PortAllocatorFactory implementation.
|
| - cricket::PortAllocator* CreatePortAllocator() override;
|
| + // webrtc::PortAllocatorFactoryInterface implementation.
|
| + cricket::PortAllocator* CreatePortAllocator(
|
| + const std::vector<StunConfiguration>& stun_servers,
|
| + const std::vector<TurnConfiguration>& turn_configurations) override;
|
|
|
| protected:
|
| ChromiumPortAllocatorFactory(
|
|
|