From c830bd627f519b9dff95b04b6ac8c104f088e1ce Mon Sep 17 00:00:00 2001 From: Harald Alvestrand Date: Thu, 24 Jun 2021 13:02:09 +0000 Subject: [PATCH] Remove ssl_certificate() accessor. The Cl landing the alternative was dated 2018, and an (informal) deprecation notice was landed. The users are now gone. Bug: None Change-Id: I1f49143fe5f2c236bf9574469f2573593b7a8086 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/223663 Commit-Queue: Harald Alvestrand Reviewed-by: Philipp Hancke Cr-Commit-Position: refs/heads/master@{#34365} --- rtc_base/rtc_certificate.cc | 5 ----- rtc_base/rtc_certificate.h | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/rtc_base/rtc_certificate.cc b/rtc_base/rtc_certificate.cc index 937defc6c2..496b4ac4b4 100644 --- a/rtc_base/rtc_certificate.cc +++ b/rtc_base/rtc_certificate.cc @@ -46,11 +46,6 @@ const SSLCertificate& RTCCertificate::GetSSLCertificate() const { return identity_->certificate(); } -// Deprecated: TODO(benwright) - Remove once chromium is updated. -const SSLCertificate& RTCCertificate::ssl_certificate() const { - return identity_->certificate(); -} - const SSLCertChain& RTCCertificate::GetSSLCertificateChain() const { return identity_->cert_chain(); } diff --git a/rtc_base/rtc_certificate.h b/rtc_base/rtc_certificate.h index ce9aa47512..fa026ec331 100644 --- a/rtc_base/rtc_certificate.h +++ b/rtc_base/rtc_certificate.h @@ -16,6 +16,7 @@ #include #include +#include "absl/base/attributes.h" #include "api/ref_counted_base.h" #include "api/scoped_refptr.h" #include "rtc_base/system/rtc_export.h" @@ -65,9 +66,6 @@ class RTC_EXPORT RTCCertificate final const SSLCertificate& GetSSLCertificate() const; const SSLCertChain& GetSSLCertificateChain() const; - // Deprecated: TODO(benwright) - Remove once chromium is updated. - const SSLCertificate& ssl_certificate() const; - // TODO(hbos): If possible, remove once RTCCertificate and its // GetSSLCertificate() is used in all relevant places. Should not pass around // raw SSLIdentity* for the sake of accessing SSLIdentity::certificate().