| Index: talk/app/webrtc/webrtcsession.cc
|
| diff --git a/talk/app/webrtc/webrtcsession.cc b/talk/app/webrtc/webrtcsession.cc
|
| index 2533328968945e4c2c67a2694e95ae8d19c288ea..558ffca6296d0ad534085e6ef18392dd7344a943 100644
|
| --- a/talk/app/webrtc/webrtcsession.cc
|
| +++ b/talk/app/webrtc/webrtcsession.cc
|
| @@ -523,7 +523,7 @@ WebRtcSession::~WebRtcSession() {
|
| bool WebRtcSession::Initialize(
|
| const PeerConnectionFactoryInterface::Options& options,
|
| const MediaConstraintsInterface* constraints,
|
| - DTLSIdentityServiceInterface* dtls_identity_service,
|
| + rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
|
| const PeerConnectionInterface::RTCConfiguration& rtc_configuration) {
|
| bundle_policy_ = rtc_configuration.bundle_policy;
|
| rtcp_mux_policy_ = rtc_configuration.rtcp_mux_policy;
|
| @@ -537,8 +537,8 @@ bool WebRtcSession::Initialize(
|
| if (options.disable_encryption) {
|
| dtls_enabled_ = false;
|
| } else {
|
| - // Enable DTLS by default if |dtls_identity_service| is valid.
|
| - dtls_enabled_ = (dtls_identity_service != NULL);
|
| + // Enable DTLS by default if we have a |dtls_identity_store|.
|
| + dtls_enabled_ = (dtls_identity_store != nullptr);
|
| // |constraints| can override the default |dtls_enabled_| value.
|
| if (FindConstraint(
|
| constraints,
|
| @@ -664,7 +664,7 @@ bool WebRtcSession::Initialize(
|
| signaling_thread(),
|
| channel_manager_,
|
| mediastream_signaling_,
|
| - dtls_identity_service,
|
| + dtls_identity_store.Pass(),
|
| this,
|
| id(),
|
| data_channel_type_,
|
|
|