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..22248bb0e373ae070c13915d05bd8102ea0597be 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"
 
 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;

[hbos_chromium, 2016/03/04 09:26:31]

I would have preferred something equivalent to rtc::Optional for |expires_ms| to
avoid two function signatures, but I couldn't find anything like that that works
accross blink and content (this being the content implementation of a blink
interface).

Instead I'm using rtc::Optional in a private helper function called by both of
these.

[tommi (sloooow) - chröme, 2016/03/04 09:55:40]

Makes sense to me.  I think we'll move from rtc::Optional to std::optional soon
enough btw.

[hbos_chromium, 2016/03/08 15:02:10]

Acknowledged.

   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,
+      rtc::Optional<uint64_t> expires_ms,

[tommi (sloooow) - chröme, 2016/03/04 09:55:40]

const &?

[hbos_chromium, 2016/03/04 12:24:11]

Yes! Will fix after webrtc land + roll.

+      blink::WebCallbacks<blink::WebRTCCertificate*, void>* observer);
+
   DISALLOW_COPY_AND_ASSIGN(RTCCertificateGenerator);
 };