| Index: talk/app/webrtc/webrtcsessiondescriptionfactory.cc
|
| diff --git a/talk/app/webrtc/webrtcsessiondescriptionfactory.cc b/talk/app/webrtc/webrtcsessiondescriptionfactory.cc
|
| index a06437f33452337188b16d716447724371435001..68e17033e86acdd0910beb095f77b0dc0a2b1720 100644
|
| --- a/talk/app/webrtc/webrtcsessiondescriptionfactory.cc
|
| +++ b/talk/app/webrtc/webrtcsessiondescriptionfactory.cc
|
| @@ -165,9 +165,15 @@ WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory(
|
| WebRtcSession* session,
|
| const std::string& session_id,
|
| cricket::DataChannelType dct)
|
| - : WebRtcSessionDescriptionFactory(
|
| - signaling_thread, channel_manager, mediastream_signaling, nullptr,
|
| - nullptr, session, session_id, dct, false) {
|
| + : WebRtcSessionDescriptionFactory(signaling_thread,
|
| + channel_manager,
|
| + mediastream_signaling,
|
| + nullptr,
|
| + nullptr,
|
| + session,
|
| + session_id,
|
| + dct,
|
| + false) {
|
| LOG(LS_VERBOSE) << "DTLS-SRTP disabled.";
|
| }
|
|
|
| @@ -180,15 +186,15 @@ WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory(
|
| const std::string& session_id,
|
| cricket::DataChannelType dct)
|
| : WebRtcSessionDescriptionFactory(
|
| - signaling_thread,
|
| - channel_manager,
|
| - mediastream_signaling,
|
| - dtls_identity_store.Pass(),
|
| - new rtc::RefCountedObject<WebRtcIdentityRequestObserver>(),
|
| - session,
|
| - session_id,
|
| - dct,
|
| - true) {
|
| + signaling_thread,
|
| + channel_manager,
|
| + mediastream_signaling,
|
| + dtls_identity_store.Pass(),
|
| + new rtc::RefCountedObject<WebRtcIdentityRequestObserver>(),
|
| + session,
|
| + session_id,
|
| + dct,
|
| + true) {
|
| DCHECK(dtls_identity_store_);
|
|
|
| certificate_request_state_ = CERTIFICATE_WAITING;
|
| @@ -215,9 +221,15 @@ WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory(
|
| WebRtcSession* session,
|
| const std::string& session_id,
|
| cricket::DataChannelType dct)
|
| - : WebRtcSessionDescriptionFactory(
|
| - signaling_thread, channel_manager, mediastream_signaling, nullptr,
|
| - nullptr, session, session_id, dct, true) {
|
| + : WebRtcSessionDescriptionFactory(signaling_thread,
|
| + channel_manager,
|
| + mediastream_signaling,
|
| + nullptr,
|
| + nullptr,
|
| + session,
|
| + session_id,
|
| + dct,
|
| + true) {
|
| DCHECK(certificate);
|
|
|
| certificate_request_state_ = CERTIFICATE_WAITING;
|
| @@ -226,9 +238,9 @@ WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory(
|
| // We already have a certificate but we wait to do SetIdentity; if we do
|
| // it in the constructor then the caller has not had a chance to connect to
|
| // SignalIdentityReady.
|
| - signaling_thread_->Post(this, MSG_USE_CONSTRUCTOR_CERTIFICATE,
|
| - new rtc::ScopedRefMessageData<rtc::RTCCertificate>(
|
| - certificate));
|
| + signaling_thread_->Post(
|
| + this, MSG_USE_CONSTRUCTOR_CERTIFICATE,
|
| + new rtc::ScopedRefMessageData<rtc::RTCCertificate>(certificate));
|
| }
|
|
|
| WebRtcSessionDescriptionFactory::~WebRtcSessionDescriptionFactory() {
|
| @@ -254,8 +266,6 @@ WebRtcSessionDescriptionFactory::~WebRtcSessionDescriptionFactory() {
|
| delete msg.pdata;
|
| }
|
| }
|
| -
|
| - transport_desc_factory_.set_certificate(nullptr);
|
| }
|
|
|
| void WebRtcSessionDescriptionFactory::CreateOffer(
|
|
|