| Index: remoting/test/fake_port_allocator.h
|
| diff --git a/remoting/test/fake_port_allocator.h b/remoting/test/fake_port_allocator.h
|
| index af6ec3f81f63990f0d63e423c3f98b22e0af9648..d848dfdbb9ad486eb0cd4dfbcae0bdc986997772 100644
|
| --- a/remoting/test/fake_port_allocator.h
|
| +++ b/remoting/test/fake_port_allocator.h
|
| @@ -9,8 +9,13 @@
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "remoting/protocol/port_allocator_factory.h"
|
| #include "third_party/webrtc/p2p/client/httpportallocator.h"
|
|
|
| +namespace rtc {
|
| +class NetworkManager;
|
| +} // namespace rtc
|
| +
|
| namespace remoting {
|
|
|
| class FakeNetworkDispatcher;
|
| @@ -18,13 +23,10 @@ class FakePacketSocketFactory;
|
|
|
| class FakePortAllocator : public cricket::HttpPortAllocatorBase {
|
| public:
|
| - static scoped_ptr<FakePortAllocator> Create(
|
| - scoped_refptr<FakeNetworkDispatcher> fake_network_dispatcher);
|
| -
|
| + FakePortAllocator(rtc::NetworkManager* network_manager,
|
| + FakePacketSocketFactory* socket_factory);
|
| ~FakePortAllocator() override;
|
|
|
| - FakePacketSocketFactory* socket_factory() { return socket_factory_.get(); }
|
| -
|
| // cricket::BasicPortAllocator overrides.
|
| cricket::PortAllocatorSession* CreateSessionInternal(
|
| const std::string& content_name,
|
| @@ -33,13 +35,25 @@ class FakePortAllocator : public cricket::HttpPortAllocatorBase {
|
| const std::string& ice_password) override;
|
|
|
| private:
|
| - FakePortAllocator(scoped_ptr<rtc::NetworkManager> network_manager,
|
| - scoped_ptr<FakePacketSocketFactory> socket_factory);
|
| + DISALLOW_COPY_AND_ASSIGN(FakePortAllocator);
|
| +};
|
|
|
| +class FakePortAllocatorFactory : public protocol::PortAllocatorFactory {
|
| + public:
|
| + FakePortAllocatorFactory(
|
| + scoped_refptr<FakeNetworkDispatcher> fake_network_dispatcher);
|
| + ~FakePortAllocatorFactory() override;
|
| +
|
| + FakePacketSocketFactory* socket_factory() { return socket_factory_.get(); }
|
| +
|
| + // PortAllocatorFactory interface.
|
| + scoped_ptr<cricket::HttpPortAllocatorBase> CreatePortAllocator() override;
|
| +
|
| + private:
|
| scoped_ptr<rtc::NetworkManager> network_manager_;
|
| scoped_ptr<FakePacketSocketFactory> socket_factory_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(FakePortAllocator);
|
| + DISALLOW_COPY_AND_ASSIGN(FakePortAllocatorFactory);
|
| };
|
|
|
| } // namespace remoting
|
|
|