| Index: talk/app/webrtc/peerconnectionfactory.cc
|
| diff --git a/talk/app/webrtc/peerconnectionfactory.cc b/talk/app/webrtc/peerconnectionfactory.cc
|
| index 3524af7932a4f92f60da84e552f742d1a2aaa7ac..1f3742c15044c5739ccaca6ec9948d16b16f323e 100644
|
| --- a/talk/app/webrtc/peerconnectionfactory.cc
|
| +++ b/talk/app/webrtc/peerconnectionfactory.cc
|
| @@ -206,11 +206,12 @@ PeerConnectionFactory::CreatePeerConnection(
|
| const MediaConstraintsInterface* constraints,
|
| PortAllocatorFactoryInterface* allocator_factory,
|
| DTLSIdentityServiceInterface* dtls_identity_service,
|
| + rtc::scoped_refptr<DtlsCertificate> certificate,
|
| PeerConnectionObserver* observer) {
|
| DCHECK(signaling_thread_->IsCurrent());
|
| DCHECK(allocator_factory || default_allocator_factory_);
|
|
|
| - if (!dtls_identity_service) {
|
| + if (!dtls_identity_service && !certificate.get()) {
|
| dtls_identity_service = new DtlsIdentityService(dtls_identity_store_.get());
|
| }
|
|
|
| @@ -225,6 +226,7 @@ PeerConnectionFactory::CreatePeerConnection(
|
| constraints,
|
| chosen_allocator_factory,
|
| dtls_identity_service,
|
| + certificate,
|
| observer)) {
|
| return NULL;
|
| }
|
|
|