| Index: remoting/protocol/libjingle_transport_factory.h
|
| diff --git a/remoting/protocol/libjingle_transport_factory.h b/remoting/protocol/libjingle_transport_factory.h
|
| index 2758eab598044069de7e95c48da37cc08d0f32d8..1fd8855d98983ffee42dee97a74bd6f045e1e87e 100644
|
| --- a/remoting/protocol/libjingle_transport_factory.h
|
| +++ b/remoting/protocol/libjingle_transport_factory.h
|
| @@ -13,9 +13,16 @@
|
|
|
| namespace cricket {
|
| class HttpPortAllocatorBase;
|
| +class PortAllocator;
|
| } // namespace cricket
|
|
|
| +namespace net {
|
| +class URLRequestContextGetter;
|
| +} // namespace net
|
| +
|
| namespace rtc {
|
| +class NetworkManager;
|
| +class PacketSocketFactory;
|
| class SocketAddress;
|
| } // namespace rtc
|
|
|
| @@ -26,8 +33,7 @@
|
|
|
| namespace protocol {
|
|
|
| -// TODO(sergeyu): Remove this class and move all code to IceTransportFactory.
|
| -class LibjingleTransportFactory {
|
| +class LibjingleTransportFactory : public TransportFactory {
|
| public:
|
| // |signal_strategy| must outlive LibjingleTransportFactory. Need to use
|
| // cricket::HttpPortAllocatorBase pointer for the |port_allocator|, so that it
|
| @@ -37,10 +43,12 @@
|
| scoped_ptr<cricket::HttpPortAllocatorBase> port_allocator,
|
| const NetworkSettings& network_settings,
|
| TransportRole role);
|
| - ~LibjingleTransportFactory();
|
|
|
| - void PrepareTokens();
|
| - scoped_ptr<Transport> CreateTransport();
|
| + ~LibjingleTransportFactory() override;
|
| +
|
| + // TransportFactory interface.
|
| + void PrepareTokens() override;
|
| + scoped_ptr<Transport> CreateTransport() override;
|
|
|
| private:
|
| void EnsureFreshJingleInfo();
|
|
|