RTCPeerConnection.generateCertificate: Optionally specify expiration.

content/renderer/media/rtc_certificate_generator.h

Index: content/renderer/media/rtc_certificate_generator.h
diff --git a/content/renderer/media/rtc_certificate_generator.h b/content/renderer/media/rtc_certificate_generator.h
index 46dfbb0a8827c511e5fd665554ae898495dad657..d01557138b6ddac41238bbb2c05a2560072ca5ec 100644
--- a/content/renderer/media/rtc_certificate_generator.h
+++ b/content/renderer/media/rtc_certificate_generator.h
@@ -9,6 +9,7 @@
 #include "third_party/WebKit/public/platform/WebRTCCertificate.h"
 #include "third_party/WebKit/public/platform/WebRTCCertificateGenerator.h"
 #include "third_party/WebKit/public/platform/WebRTCKeyParams.h"
+#include "third_party/webrtc/base/optional.h"

[Ryan Sleevi, 2016/03/08 17:06:11]

This is unnecessary

[hbos_chromium, 2016/04/13 17:03:08]

It's needed because only the private helper function uses Optional, the
interface being implemented uses different signatures for if expiration is used
or not (since that is a blink interface which does not have access to
opetional.h).

 
 namespace content {
 
@@ -26,9 +27,22 @@ class RTCCertificateGenerator : public blink::WebRTCCertificateGenerator {
       const blink::WebURL& url,
       const blink::WebURL& first_party_for_cookies,
       blink::WebCallbacks<blink::WebRTCCertificate*, void>* observer) override;
+  void generateCertificate(
+      const blink::WebRTCKeyParams& key_params,
+      const blink::WebURL& url,
+      const blink::WebURL& first_party_for_cookies,
+      uint64_t expires_ms,
+      blink::WebCallbacks<blink::WebRTCCertificate*, void>* observer) override;
   bool isSupportedKeyParams(const blink::WebRTCKeyParams& key_params) override;
 
  private:
+  void generateCertificateExpires(
+      const blink::WebRTCKeyParams& key_params,
+      const blink::WebURL& url,
+      const blink::WebURL& first_party_for_cookies,
+      const rtc::Optional<uint64_t>& expires_ms,
+      blink::WebCallbacks<blink::WebRTCCertificate*, void>* observer);
+
   DISALLOW_COPY_AND_ASSIGN(RTCCertificateGenerator);
 };