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