| Index: remoting/protocol/webrtc_transport.h
|
| diff --git a/remoting/protocol/webrtc_transport.h b/remoting/protocol/webrtc_transport.h
|
| index afba35e5fbd61486e9a6dc397bd6a708e9a64efa..fac099ef8ea938bc67d1f190aecb988c3486376d 100644
|
| --- a/remoting/protocol/webrtc_transport.h
|
| +++ b/remoting/protocol/webrtc_transport.h
|
| @@ -23,13 +23,13 @@ class FakeAudioDeviceModule;
|
| namespace remoting {
|
| namespace protocol {
|
|
|
| +class TransportContext;
|
| +
|
| class WebrtcTransport : public Transport,
|
| public webrtc::PeerConnectionObserver {
|
| public:
|
| WebrtcTransport(rtc::Thread* worker_thread,
|
| - rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
|
| - port_allocator_factory,
|
| - TransportRole role);
|
| + scoped_refptr<TransportContext> transport_context);
|
| ~WebrtcTransport() override;
|
|
|
| webrtc::PeerConnectionInterface* peer_connection() {
|
| @@ -48,6 +48,9 @@ class WebrtcTransport : public Transport,
|
| WebrtcTransport* AsWebrtcTransport() override;
|
|
|
| private:
|
| + void OnPortAllocatorCreated(
|
| + scoped_ptr<cricket::PortAllocator> port_allocator);
|
| +
|
| void OnLocalSessionDescriptionCreated(
|
| scoped_ptr<webrtc::SessionDescriptionInterface> description,
|
| const std::string& error);
|
| @@ -79,9 +82,7 @@ class WebrtcTransport : public Transport,
|
|
|
| base::ThreadChecker thread_checker_;
|
|
|
| - rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
|
| - port_allocator_factory_;
|
| - TransportRole role_;
|
| + scoped_refptr<TransportContext> transport_context_;
|
| EventHandler* event_handler_ = nullptr;
|
| rtc::Thread* worker_thread_;
|
|
|
| @@ -110,12 +111,8 @@ class WebrtcTransport : public Transport,
|
|
|
| class WebrtcTransportFactory : public TransportFactory {
|
| public:
|
| - WebrtcTransportFactory(
|
| - rtc::Thread* worker_thread,
|
| - SignalStrategy* signal_strategy,
|
| - rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
|
| - port_allocator_factory,
|
| - TransportRole role);
|
| + WebrtcTransportFactory(rtc::Thread* worker_thread,
|
| + scoped_refptr<TransportContext> transport_context);
|
| ~WebrtcTransportFactory() override;
|
|
|
| // TransportFactory interface.
|
| @@ -123,10 +120,7 @@ class WebrtcTransportFactory : public TransportFactory {
|
|
|
| private:
|
| rtc::Thread* worker_thread_;
|
| - SignalStrategy* signal_strategy_;
|
| - rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
|
| - port_allocator_factory_;
|
| - TransportRole role_;
|
| + scoped_refptr<TransportContext> transport_context_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WebrtcTransportFactory);
|
| };
|
|
|