summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/webrtc_transport.h
diff options
context:
space:
mode:
authorhans <hans@chromium.org>2015-12-10 17:15:50 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-11 01:16:58 +0000
commited698a70b951776aac2af82e3d7c73c6d201e1b8 (patch)
tree0b6ea042623e63fbd45db84adb3b5175ed3769d7 /remoting/protocol/webrtc_transport.h
parent2b39d196a76765d700226bfef8d01edfe5581a43 (diff)
downloadchromium_src-ed698a70b951776aac2af82e3d7c73c6d201e1b8.zip
chromium_src-ed698a70b951776aac2af82e3d7c73c6d201e1b8.tar.gz
chromium_src-ed698a70b951776aac2af82e3d7c73c6d201e1b8.tar.bz2
Revert of Removing references to webrtc::PortAllocatorFactoryInterface. (patchset #6 id:100001 of https://codereview.chromium.org/1500663003/ )
Reason for revert: Broke the build: ../../remoting/host/remoting_me2me_host.cc:1505:9: error: no viable conversion from 'scoped_ptr<remoting::protocol::PortAllocatorFactory>' to 'rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>' port_allocator_factory = protocol::ChromiumPortAllocatorFactory::Create( ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../third_party/webrtc/base/scoped_ref_ptr.h:76:3: note: candidate constructor not viable: no known conversion from 'scoped_ptr<remoting::protocol::PortAllocatorFactory>' to 'webrtc::PortAllocatorFactoryInterface *' for 1st argument scoped_refptr(T* p) : ptr_(p) { ^ ../../third_party/webrtc/base/scoped_ref_ptr.h:81:3: note: candidate constructor not viable: no known conversion from 'scoped_ptr<remoting::protocol::PortAllocatorFactory>' to 'const scoped_refptr<webrtc::PortAllocatorFactoryInterface> &' for 1st argument scoped_refptr(const scoped_refptr<T>& r) : ptr_(r.ptr_) { ^ ../../third_party/webrtc/base/scoped_ref_ptr.h:87:3: note: candidate template ignored: could not match 'scoped_refptr' against 'scoped_ptr' scoped_refptr(const scoped_refptr<U>& r) : ptr_(r.get()) { ^ ../../base/memory/scoped_ptr.h:378:3: note: candidate function operator Testable() const { ^ 1 error generated. From https://build.chromium.org/p/chromium.linux/builders/Linux%20Builder%20%28dbg%29/builds/97032/ Original issue's description: > Removing references to webrtc::PortAllocatorFactoryInterface. > > Now using a new CreatePeerConnection method that takes a > PortAllocator as input. This removes the need for some > boilerplate code and code duplication between webrtc and chromium. > It also fixes an issue with TURN candidate priorities. > > BUG=webrtc:5209 > > Committed: https://crrev.com/ad868b5edf13e869e835b847078b4dcc8aa7cd0d > Cr-Commit-Position: refs/heads/master@{#364544} TBR=sergeyu@chromium.org,deadbeef@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5209 Review URL: https://codereview.chromium.org/1514853003 Cr-Commit-Position: refs/heads/master@{#364556}
Diffstat (limited to 'remoting/protocol/webrtc_transport.h')
-rw-r--r--remoting/protocol/webrtc_transport.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/remoting/protocol/webrtc_transport.h b/remoting/protocol/webrtc_transport.h
index 6fc79d7..afba35e 100644
--- a/remoting/protocol/webrtc_transport.h
+++ b/remoting/protocol/webrtc_transport.h
@@ -6,13 +6,11 @@
#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_checker.h"
#include "base/timer/timer.h"
-#include "remoting/protocol/port_allocator_factory.h"
#include "remoting/protocol/transport.h"
#include "remoting/protocol/webrtc_data_stream_adapter.h"
#include "remoting/signaling/signal_strategy.h"
@@ -29,7 +27,8 @@ class WebrtcTransport : public Transport,
public webrtc::PeerConnectionObserver {
public:
WebrtcTransport(rtc::Thread* worker_thread,
- PortAllocatorFactory* port_allocator_factory,
+ rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
+ port_allocator_factory,
TransportRole role);
~WebrtcTransport() override;
@@ -80,7 +79,8 @@ class WebrtcTransport : public Transport,
base::ThreadChecker thread_checker_;
- PortAllocatorFactory* port_allocator_factory_;
+ rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
+ port_allocator_factory_;
TransportRole role_;
EventHandler* event_handler_ = nullptr;
rtc::Thread* worker_thread_;
@@ -113,7 +113,8 @@ class WebrtcTransportFactory : public TransportFactory {
WebrtcTransportFactory(
rtc::Thread* worker_thread,
SignalStrategy* signal_strategy,
- scoped_ptr<PortAllocatorFactory> port_allocator_factory,
+ rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
+ port_allocator_factory,
TransportRole role);
~WebrtcTransportFactory() override;
@@ -123,7 +124,8 @@ class WebrtcTransportFactory : public TransportFactory {
private:
rtc::Thread* worker_thread_;
SignalStrategy* signal_strategy_;
- scoped_ptr<PortAllocatorFactory> port_allocator_factory_;
+ rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
+ port_allocator_factory_;
TransportRole role_;
DISALLOW_COPY_AND_ASSIGN(WebrtcTransportFactory);