Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(924)

Unified Diff: talk/app/webrtc/webrtcsession.cc

Issue 1312643004: Replaces SSLIdentity* with scoped_refptr<RTCCertificate> in cricket::Transport layer. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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/webrtcsession.cc
diff --git a/talk/app/webrtc/webrtcsession.cc b/talk/app/webrtc/webrtcsession.cc
index 3d192c22d10b8bc9e8dcf3ba961e4cdd55860363..f73cf39806fc6f424ddb9f7ef47f53e3ce670330 100644
--- a/talk/app/webrtc/webrtcsession.cc
+++ b/talk/app/webrtc/webrtcsession.cc
@@ -564,7 +564,6 @@ WebRtcSession::~WebRtcSession() {
for (size_t i = 0; i < saved_candidates_.size(); ++i) {
delete saved_candidates_[i];
}
- delete identity();
}
bool WebRtcSession::Initialize(
@@ -751,8 +750,8 @@ bool WebRtcSession::Initialize(
}
}
- webrtc_session_desc_factory_->SignalIdentityReady.connect(
- this, &WebRtcSession::OnIdentityReady);
+ webrtc_session_desc_factory_->SignalCertificateReady.connect(
+ this, &WebRtcSession::OnCertificateReady);
if (options.disable_encryption) {
webrtc_session_desc_factory_->SetSdesPolicy(cricket::SEC_DISABLED);
@@ -1392,11 +1391,12 @@ void WebRtcSession::ResetIceRestartLatch() {
ice_restart_latch_->Reset();
}
-void WebRtcSession::OnIdentityReady(rtc::SSLIdentity* identity) {
- SetIdentity(identity);
+void WebRtcSession::OnCertificateReady(
+ const rtc::scoped_refptr<rtc::RTCCertificate>& certificate) {
+ SetCertificate(certificate);
}
-bool WebRtcSession::waiting_for_identity_for_testing() const {
+bool WebRtcSession::waiting_for_certificate_for_testing() const {
return webrtc_session_desc_factory_->waiting_for_certificate_for_testing();
}

Powered by Google App Engine
This is Rietveld 408576698