RTCPeerConnection.generateCertificate: Optionally specify expiration.

content/renderer/media/rtc_certificate_generator.h

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_RTC_CERTIFICATE_GENERATOR_H_
 #define CONTENT_RENDERER_MEDIA_RTC_CERTIFICATE_GENERATOR_H_
 
 #include "base/macros.h"
 #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 {
 
 // Chromium's WebRTCCertificateGenerator implementation; uses the
 // PeerConnectionIdentityStore/SSLIdentity::Generate to generate the identity,
 // rtc::RTCCertificate and content::RTCCertificate.
 class RTCCertificateGenerator : public blink::WebRTCCertificateGenerator {
  public:
   RTCCertificateGenerator() {}
   ~RTCCertificateGenerator() override {}
 
   // blink::WebRTCCertificateGenerator implementation.
   void generateCertificate(
       const blink::WebRTCKeyParams& key_params,
       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);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_RTC_CERTIFICATE_GENERATOR_H_