| Index: content/renderer/media/rtc_certificate_generator.cc
|
| diff --git a/content/renderer/media/rtc_certificate_generator.cc b/content/renderer/media/rtc_certificate_generator.cc
|
| index 2928fa6b48ccd26f63e4d1c419dd0f0e043a97a4..3c7333635f556aef36809b9d6b230bd730ad1e98 100644
|
| --- a/content/renderer/media/rtc_certificate_generator.cc
|
| +++ b/content/renderer/media/rtc_certificate_generator.cc
|
| @@ -115,7 +115,7 @@ class RTCCertificateIdentityObserver
|
| FROM_HERE,
|
| base::Bind(&RTCCertificateIdentityObserver::DoCallbackOnMainThread,
|
| this, base::Passed(base::WrapUnique(
|
| - new RTCCertificate(key_params_, certificate)))));
|
| + new RTCCertificate(certificate)))));
|
| }
|
|
|
| void DoCallbackOnMainThread(
|
| @@ -197,4 +197,14 @@ bool RTCCertificateGenerator::isSupportedKeyParams(
|
| return WebRTCKeyParamsToKeyParams(key_params).IsValid();
|
| }
|
|
|
| +std::unique_ptr<blink::WebRTCCertificate> RTCCertificateGenerator::fromPEM(
|
| + const std::string& pem_private_key,
|
| + const std::string& pem_certificate) {
|
| + rtc::scoped_refptr<rtc::RTCCertificate> certificate =
|
| + rtc::RTCCertificate::FromPEM(
|
| + rtc::RTCCertificatePEM(pem_private_key, pem_certificate));
|
| + return std::unique_ptr<blink::WebRTCCertificate>(
|
| + new RTCCertificate(certificate));
|
| +}
|
| +
|
| } // namespace content
|
|
|