| Index: talk/app/webrtc/webrtcsession.h
|
| diff --git a/talk/app/webrtc/webrtcsession.h b/talk/app/webrtc/webrtcsession.h
|
| index 30ebc1e49ee8dcc07e015e20f784f87d84af725e..5da083057d48aff0e1824325ae90d51ee96c0727 100644
|
| --- a/talk/app/webrtc/webrtcsession.h
|
| +++ b/talk/app/webrtc/webrtcsession.h
|
| @@ -31,6 +31,7 @@
|
| #include <string>
|
|
|
| #include "talk/app/webrtc/datachannel.h"
|
| +#include "talk/app/webrtc/dtlscertificate.h"
|
| #include "talk/app/webrtc/dtmfsender.h"
|
| #include "talk/app/webrtc/mediastreamprovider.h"
|
| #include "talk/app/webrtc/peerconnectioninterface.h"
|
| @@ -125,7 +126,7 @@ class WebRtcSession : public cricket::BaseSession,
|
| bool Initialize(
|
| const PeerConnectionFactoryInterface::Options& options,
|
| const MediaConstraintsInterface* constraints,
|
| - DTLSIdentityServiceInterface* dtls_identity_service,
|
| + rtc::scoped_refptr<webrtc::DtlsCertificate> certificate,
|
| const PeerConnectionInterface::RTCConfiguration& rtc_configuration);
|
| // Deletes the voice, video and data channel and changes the session state
|
| // to STATE_RECEIVEDTERMINATE.
|
| @@ -245,13 +246,13 @@ class WebRtcSession : public cricket::BaseSession,
|
|
|
| void ResetIceRestartLatch();
|
|
|
| - // Called when an SSLIdentity is generated or retrieved by
|
| + // Called when a DtlsCertificate is generated or retrieved by
|
| // WebRTCSessionDescriptionFactory. Should happen before setLocalDescription.
|
| - void OnIdentityReady(rtc::SSLIdentity* identity);
|
| + void OnCertificateReady(rtc::scoped_refptr<DtlsCertificate> certificate);
|
| void OnDtlsSetupFailure(cricket::BaseChannel*, bool rtcp);
|
|
|
| // For unit test.
|
| - bool waiting_for_identity() const;
|
| + bool waiting_for_certificate() const;
|
|
|
| void set_metrics_observer(
|
| webrtc::MetricsObserverInterface* metrics_observer) {
|
| @@ -392,6 +393,7 @@ class WebRtcSession : public cricket::BaseSession,
|
| // 3. If both 1&2 are false, data channel is not allowed (DCT_NONE).
|
| cricket::DataChannelType data_channel_type_;
|
| rtc::scoped_ptr<IceRestartAnswerLatch> ice_restart_latch_;
|
| + rtc::scoped_refptr<DtlsCertificate> certificate_;
|
|
|
| rtc::scoped_ptr<WebRtcSessionDescriptionFactory>
|
| webrtc_session_desc_factory_;
|
|
|