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

Unified Diff: webrtc/p2p/base/transportchannelproxy.cc

Issue 1304043008: Replacing SSLIdentity* with scoped_refptr<RTCCertificate> in TransportChannel layer (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Making overriding "virtual" methods use the override keyword Created 5 years, 3 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
« no previous file with comments | « webrtc/p2p/base/transportchannelproxy.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/transportchannelproxy.cc
diff --git a/webrtc/p2p/base/transportchannelproxy.cc b/webrtc/p2p/base/transportchannelproxy.cc
index 79772514c69a3adc3b53172a688732d1c6ef5e5e..f7946dd96f9a2ec4befabf1413e222052a1bdbcd 100644
--- a/webrtc/p2p/base/transportchannelproxy.cc
+++ b/webrtc/p2p/base/transportchannelproxy.cc
@@ -189,22 +189,22 @@ bool TransportChannelProxy::GetSslCipher(std::string* cipher) {
return impl_->GetSslCipher(cipher);
}
-bool TransportChannelProxy::GetLocalIdentity(
- rtc::SSLIdentity** identity) const {
+rtc::scoped_refptr<rtc::RTCCertificate>
+TransportChannelProxy::GetLocalCertificate() const {
ASSERT(rtc::Thread::Current() == worker_thread_);
if (!impl_) {
- return false;
+ return nullptr;
}
- return impl_->GetLocalIdentity(identity);
+ return impl_->GetLocalCertificate();
}
-bool TransportChannelProxy::GetRemoteCertificate(
+bool TransportChannelProxy::GetRemoteSSLCertificate(
rtc::SSLCertificate** cert) const {
ASSERT(rtc::Thread::Current() == worker_thread_);
if (!impl_) {
return false;
}
- return impl_->GetRemoteCertificate(cert);
+ return impl_->GetRemoteSSLCertificate(cert);
}
bool TransportChannelProxy::ExportKeyingMaterial(const std::string& label,
« no previous file with comments | « webrtc/p2p/base/transportchannelproxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698