Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Side by Side Diff: webrtc/base/rtccertificate.cc

Issue 1920043002: Replace scoped_ptr with unique_ptr in webrtc/base/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/base/rtccertificate.h ('k') | webrtc/base/rtccertificate_unittests.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2015 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include <memory>
12
11 #include "webrtc/base/rtccertificate.h" 13 #include "webrtc/base/rtccertificate.h"
12 14
13 #include "webrtc/base/checks.h" 15 #include "webrtc/base/checks.h"
14 16
15 namespace rtc { 17 namespace rtc {
16 18
17 scoped_refptr<RTCCertificate> RTCCertificate::Create( 19 scoped_refptr<RTCCertificate> RTCCertificate::Create(
18 scoped_ptr<SSLIdentity> identity) { 20 std::unique_ptr<SSLIdentity> identity) {
19 return new RefCountedObject<RTCCertificate>(identity.release()); 21 return new RefCountedObject<RTCCertificate>(identity.release());
20 } 22 }
21 23
22 RTCCertificate::RTCCertificate(SSLIdentity* identity) 24 RTCCertificate::RTCCertificate(SSLIdentity* identity)
23 : identity_(identity) { 25 : identity_(identity) {
24 RTC_DCHECK(identity_); 26 RTC_DCHECK(identity_);
25 } 27 }
26 28
27 RTCCertificate::~RTCCertificate() { 29 RTCCertificate::~RTCCertificate() {
28 } 30 }
29 31
30 uint64_t RTCCertificate::Expires() const { 32 uint64_t RTCCertificate::Expires() const {
31 int64_t expires = ssl_certificate().CertificateExpirationTime(); 33 int64_t expires = ssl_certificate().CertificateExpirationTime();
32 if (expires != -1) 34 if (expires != -1)
33 return static_cast<uint64_t>(expires) * kNumMillisecsPerSec; 35 return static_cast<uint64_t>(expires) * kNumMillisecsPerSec;
34 // If the expiration time could not be retrieved return an expired timestamp. 36 // If the expiration time could not be retrieved return an expired timestamp.
35 return 0; // = 1970-01-01 37 return 0; // = 1970-01-01
36 } 38 }
37 39
38 bool RTCCertificate::HasExpired(uint64_t now) const { 40 bool RTCCertificate::HasExpired(uint64_t now) const {
39 return Expires() <= now; 41 return Expires() <= now;
40 } 42 }
41 43
42 const SSLCertificate& RTCCertificate::ssl_certificate() const { 44 const SSLCertificate& RTCCertificate::ssl_certificate() const {
43 return identity_->certificate(); 45 return identity_->certificate();
44 } 46 }
45 47
46 } // namespace rtc 48 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/rtccertificate.h ('k') | webrtc/base/rtccertificate_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698