| Index: remoting/protocol/webrtc_transport.h
|
| diff --git a/remoting/protocol/webrtc_transport.h b/remoting/protocol/webrtc_transport.h
|
| index 74ec30c9b4140ae7db0c8686aeb3d2c4a275b028..03c658a2d46c2b96ee7b22e22f99afd537237025 100644
|
| --- a/remoting/protocol/webrtc_transport.h
|
| +++ b/remoting/protocol/webrtc_transport.h
|
| @@ -6,12 +6,14 @@
|
| #define REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_
|
|
|
| #include "base/macros.h"
|
| +#include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/threading/thread.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "base/timer/timer.h"
|
| +#include "remoting/protocol/port_allocator_factory_interface.h"
|
| #include "remoting/protocol/transport.h"
|
| #include "remoting/protocol/webrtc_data_stream_adapter.h"
|
| #include "remoting/signaling/signal_strategy.h"
|
| @@ -28,8 +30,7 @@ class WebrtcTransport : public Transport,
|
| public webrtc::PeerConnectionObserver {
|
| public:
|
| WebrtcTransport(
|
| - rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
|
| - port_allocator_factory,
|
| + scoped_refptr<PortAllocatorFactoryInterface> port_allocator_factory,
|
| TransportRole role,
|
| scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner);
|
| ~WebrtcTransport() override;
|
| @@ -70,8 +71,7 @@ class WebrtcTransport : public Transport,
|
|
|
| base::ThreadChecker thread_checker_;
|
|
|
| - rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
|
| - port_allocator_factory_;
|
| + scoped_refptr<PortAllocatorFactoryInterface> port_allocator_factory_;
|
| TransportRole role_;
|
| EventHandler* event_handler_ = nullptr;
|
| scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner_;
|
| @@ -101,8 +101,7 @@ class WebrtcTransportFactory : public TransportFactory {
|
| public:
|
| WebrtcTransportFactory(
|
| SignalStrategy* signal_strategy,
|
| - rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
|
| - port_allocator_factory,
|
| + scoped_refptr<PortAllocatorFactoryInterface> port_allocator_factory,
|
| TransportRole role);
|
| ~WebrtcTransportFactory() override;
|
|
|
| @@ -111,8 +110,7 @@ class WebrtcTransportFactory : public TransportFactory {
|
|
|
| private:
|
| SignalStrategy* signal_strategy_;
|
| - rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
|
| - port_allocator_factory_;
|
| + scoped_refptr<PortAllocatorFactoryInterface> port_allocator_factory_;
|
| TransportRole role_;
|
|
|
| base::Thread worker_thread_;
|
|
|