talk/app/webrtc/peerconnectionfactoryproxy.h - Issue 1520963002: Removing webrtc::PortAllocatorFactoryInterface.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: talk/app/webrtc/peerconnectionfactoryproxy.h

Issue 1520963002: Removing webrtc::PortAllocatorFactoryInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Fixing patch conflicts 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

« no previous file with comments | « talk/app/webrtc/peerconnectionfactory_unittest.cc ('k') | talk/app/webrtc/peerconnectioninterface.h » ('j') | webrtc/p2p/client/basicportallocator.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: talk/app/webrtc/peerconnectionfactoryproxy.h

diff --git a/talk/app/webrtc/peerconnectionfactoryproxy.h b/talk/app/webrtc/peerconnectionfactoryproxy.h

index db34ea72cec74071d4135f0095e4419b0bb409e2..714ce6b7eb643db20f0539449a71309ce448b5b9 100644

--- a/talk/app/webrtc/peerconnectionfactoryproxy.h

+++ b/talk/app/webrtc/peerconnectionfactoryproxy.h

@@ -44,21 +44,11 @@ BEGIN_PROXY_MAP(PeerConnectionFactory)

rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(

const PeerConnectionInterface::RTCConfiguration& a1,

const MediaConstraintsInterface* a2,

- PortAllocatorFactoryInterface* a3,

- rtc::scoped_ptr<DtlsIdentityStoreInterface> a4,

- PeerConnectionObserver* a5) override {

- return owner_thread_->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(

- rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot1, this,

- a1, a2, a3, a4.release(), a5));

- }

- rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(

- const PeerConnectionInterface::RTCConfiguration& a1,

- const MediaConstraintsInterface* a2,

rtc::scoped_ptr<cricket::PortAllocator> a3,

rtc::scoped_ptr<DtlsIdentityStoreInterface> a4,

PeerConnectionObserver* a5) override {

return owner_thread_->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(

- rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot2, this,

+ rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, this,

a1, a2, a3.release(), a4.release(), a5));

}

PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>,

@@ -78,17 +68,7 @@ BEGIN_PROXY_MAP(PeerConnectionFactory)

PROXY_METHOD0(void, StopRtcEventLog)

private:

- rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot1(

- const PeerConnectionInterface::RTCConfiguration& a1,

- const MediaConstraintsInterface* a2,

- PortAllocatorFactoryInterface* a3,

- DtlsIdentityStoreInterface* a4,

- PeerConnectionObserver* a5) {

- rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);

- return c_->CreatePeerConnection(a1, a2, a3, std::move(ptr_a4), a5);

- }

- rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot2(

+ rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot(

const PeerConnectionInterface::RTCConfiguration& a1,

const MediaConstraintsInterface* a2,

cricket::PortAllocator* a3,

« no previous file with comments | « talk/app/webrtc/peerconnectionfactory_unittest.cc ('k') | talk/app/webrtc/peerconnectioninterface.h » ('j') | webrtc/p2p/client/basicportallocator.cc » ('J')