RTCCertificate::Expires() and ::HasExpired() implemented

webrtc/base/rtccertificate.cc

Index: webrtc/base/rtccertificate.cc
diff --git a/webrtc/base/rtccertificate.cc b/webrtc/base/rtccertificate.cc
index a176d9080b2cc02dacced71778f453d88b81a414..2ee6959e32f327a7344c2dd5dc22081100538bc9 100644
--- a/webrtc/base/rtccertificate.cc
+++ b/webrtc/base/rtccertificate.cc
@@ -28,13 +28,16 @@ RTCCertificate::RTCCertificate(SSLIdentity* identity)
 RTCCertificate::~RTCCertificate() {
 }
 
-uint64_t RTCCertificate::expires_timestamp_ns() const {
-  // TODO(hbos): Update once SSLIdentity/SSLCertificate supports expires field.
-  return 0;
+uint64_t RTCCertificate::Expires() const {
+  int64_t expires = ssl_certificate().CertificateExpirationTime();
+  if (expires != -1)
+    return static_cast<uint64_t>(expires) * 1000;  // s -> ms

[torbjorng (webrtc), 2015/12/07 12:43:19]

nit: use kNumMillisecsPerSec analogous to code below.

[hbos, 2015/12/07 14:20:50]

Done.

+  // If the expiration time could not be retrieved return an expired timestamp.
+  return 0;  // = 1970-01-01
 }
 
 bool RTCCertificate::HasExpired() const {
-  return expires_timestamp_ns() <= TimeNanos();
+  return Expires() <= TimeNanos() / kNumNanosecsPerMillisec;
 }
 
 const SSLCertificate& RTCCertificate::ssl_certificate() const {