talk/app/webrtc/peerconnection.cc - Issue 1269843005: Added DtlsCertificate, a ref counted object owning an SSLIdentity

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/peerconnection.cc

Issue 1269843005: Added DtlsCertificate, a ref counted object owning an SSLIdentity (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: webrtcsession_unittest cleanup Created 5 years, 4 months 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: talk/app/webrtc/peerconnection.cc

diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc

index dba77da219df45c8c47709ceed5c7cc71a805d94..7d8cf165d5a79c0fcbcf90c16f6094c11167e3c1 100644

--- a/talk/app/webrtc/peerconnection.cc

+++ b/talk/app/webrtc/peerconnection.cc

@@ -349,7 +349,7 @@ bool PeerConnection::Initialize(

const PeerConnectionInterface::RTCConfiguration& configuration,

const MediaConstraintsInterface* constraints,

PortAllocatorFactoryInterface* allocator_factory,

- DTLSIdentityServiceInterface* dtls_identity_service,

+ rtc::scoped_refptr<webrtc::DtlsCertificate> certificate,

hbos 2015/08/04 12:50:21 Already in webrtc namespace, I shall remove "webrt

PeerConnectionObserver* observer) {

ASSERT(observer != NULL);

if (!observer)

@@ -405,7 +405,7 @@ bool PeerConnection::Initialize(

// Initialize the WebRtcSession. It creates transport channels etc.

if (!session_->Initialize(factory_->options(), constraints,

- dtls_identity_service, configuration))

+ certificate, configuration))

return false;

// Register PeerConnection as receiver of local ice candidates.

« talk/app/webrtc/peerconnection.h ('K') | « talk/app/webrtc/peerconnection.h ('k') | talk/app/webrtc/peerconnectionfactory.h » ('j') | talk/app/webrtc/peerconnectionfactory.cc » ('J')