Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1322)

Unified Diff: remoting/protocol/webrtc_transport.h

Issue 1500663003: Removing references to webrtc::PortAllocatorFactoryInterface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing merge conflict, and removing some dead code. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/protocol/webrtc_transport.h
diff --git a/remoting/protocol/webrtc_transport.h b/remoting/protocol/webrtc_transport.h
index 74ec30c9b4140ae7db0c8686aeb3d2c4a275b028..3d42398c5513765ceff83ef4879d010c28a91036 100644
--- a/remoting/protocol/webrtc_transport.h
+++ b/remoting/protocol/webrtc_transport.h
@@ -12,6 +12,7 @@
#include "base/threading/thread.h"
#include "base/threading/thread_checker.h"
#include "base/timer/timer.h"
+#include "remoting/protocol/network_settings.h"
#include "remoting/protocol/transport.h"
#include "remoting/protocol/webrtc_data_stream_adapter.h"
#include "remoting/signaling/signal_strategy.h"
@@ -28,8 +29,7 @@ class WebrtcTransport : public Transport,
public webrtc::PeerConnectionObserver {
public:
WebrtcTransport(
- rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
- port_allocator_factory,
+ const NetworkSettings& network_settings,
TransportRole role,
scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner);
~WebrtcTransport() override;
@@ -70,8 +70,7 @@ class WebrtcTransport : public Transport,
base::ThreadChecker thread_checker_;
- rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
- port_allocator_factory_;
+ NetworkSettings network_settings_;
TransportRole role_;
EventHandler* event_handler_ = nullptr;
scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner_;
@@ -99,11 +98,9 @@ class WebrtcTransport : public Transport,
class WebrtcTransportFactory : public TransportFactory {
public:
- WebrtcTransportFactory(
- SignalStrategy* signal_strategy,
- rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
- port_allocator_factory,
- TransportRole role);
+ WebrtcTransportFactory(SignalStrategy* signal_strategy,
+ const NetworkSettings& network_settings,
+ TransportRole role);
~WebrtcTransportFactory() override;
// TransportFactory interface.
@@ -111,8 +108,7 @@ class WebrtcTransportFactory : public TransportFactory {
private:
SignalStrategy* signal_strategy_;
- rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
- port_allocator_factory_;
+ NetworkSettings network_settings_;
TransportRole role_;
base::Thread worker_thread_;

Powered by Google App Engine
This is Rietveld 408576698