RTCPeerConnection.generateCertificate: Optionally specify expiration.

content/renderer/media/rtc_certificate_generator.cc

 // 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.
 
 #include "content/renderer/media/rtc_certificate_generator.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "content/renderer/media/peer_connection_identity_store.h"
@@ skipping 37 matching lines @@
   }
   ~RTCCertificateIdentityObserver() override {}
 
   // Perform |store|->RequestIdentity with this identity observer and ensure
   // that this identity observer is not deleted until the request has completed
   // by holding on to a reference to itself for the duration of the request.
   void RequestIdentity(
       const blink::WebRTCKeyParams& key_params,
       const GURL& url,
       const GURL& first_party_for_cookies,
+      const rtc::Optional<uint64_t>& expires_ms,
       blink::WebCallbacks<blink::WebRTCCertificate*, void>* observer) {
     DCHECK(main_thread_->BelongsToCurrentThread());
     DCHECK(!observer_) << "Already have a RequestIdentity in progress.";
     DCHECK(observer);
     key_params_ = key_params;
     observer_ = observer;
     // Identity request must be performed on the WebRTC signaling thread.
     signaling_thread_->PostTask(FROM_HERE, base::Bind(
         &RTCCertificateIdentityObserver::RequestIdentityOnWebRtcSignalingThread,
-        this, url, first_party_for_cookies));
+        this, url, first_party_for_cookies, expires_ms));

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

(I'm purposefully using the copy constructor here since it's posting.)

   }
 
  private:
   void RequestIdentityOnWebRtcSignalingThread(
       GURL url,
-      GURL first_party_for_cookies) {
+      GURL first_party_for_cookies,
+      rtc::Optional<uint64_t> expires_ms) {
     DCHECK(signaling_thread_->BelongsToCurrentThread());
     rtc::scoped_ptr<PeerConnectionIdentityStore> store(
         new PeerConnectionIdentityStore(
             main_thread_, signaling_thread_, url, first_party_for_cookies));
     // Request identity with |this| as the observer. OnSuccess/OnFailure will be
     // called asynchronously.
-    store->RequestIdentity(WebRTCKeyParamsToKeyParams(key_params_), this);
+    store->RequestIdentity(WebRTCKeyParamsToKeyParams(key_params_),
+                           expires_ms, this);
   }
 
   // webrtc::DtlsIdentityRequestObserver implementation.
   void OnFailure(int error) override {
     DCHECK(signaling_thread_->BelongsToCurrentThread());
     DCHECK(observer_);
     main_thread_->PostTask(FROM_HERE, base::Bind(
         &RTCCertificateIdentityObserver::DoCallbackOnMainThread,
         this, nullptr));
   }
@@ skipping 40 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(RTCCertificateIdentityObserver);
 };
 
 }  // namespace
 
 void RTCCertificateGenerator::generateCertificate(
     const blink::WebRTCKeyParams& key_params,
     const blink::WebURL& url,
     const blink::WebURL& first_party_for_cookies,
     blink::WebCallbacks<blink::WebRTCCertificate*, void>* observer) {
+  generateCertificateExpires(key_params, url, first_party_for_cookies,
+                             rtc::Optional<uint64_t>(), observer);
+}
+
+void RTCCertificateGenerator::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) {
+  generateCertificateExpires(key_params, url, first_party_for_cookies,
+                             rtc::Optional<uint64_t>(expires_ms), observer);
+}
+
+void RTCCertificateGenerator::generateCertificateExpires(

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

generateCertificateWithExpiration

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

Done.

+    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) {
   DCHECK(isSupportedKeyParams(key_params));
 
 #if defined(ENABLE_WEBRTC)
   const scoped_refptr<base::SingleThreadTaskRunner> main_thread =
       base::ThreadTaskRunnerHandle::Get();
 
   PeerConnectionDependencyFactory* pc_dependency_factory =
       RenderThreadImpl::current()->GetPeerConnectionDependencyFactory();
   pc_dependency_factory->EnsureInitialized();
   const scoped_refptr<base::SingleThreadTaskRunner> signaling_thread =
       pc_dependency_factory->GetWebRtcSignalingThread();
 
   rtc::scoped_refptr<RTCCertificateIdentityObserver> identity_observer(
       new rtc::RefCountedObject<RTCCertificateIdentityObserver>(
           main_thread, signaling_thread));
   // |identity_observer| lives until request has completed.
   identity_observer->RequestIdentity(
-      key_params, url, first_party_for_cookies, observer);
+      key_params, url, first_party_for_cookies, expires_ms, observer);
 #else
   observer->onError();
 #endif
 }
 
 bool RTCCertificateGenerator::isSupportedKeyParams(
     const blink::WebRTCKeyParams& key_params) {
   return WebRTCKeyParamsToKeyParams(key_params).IsValid();
 }
 
 }  // namespace content