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

Unified Diff: webrtc/base/rtccertificate.h

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, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/referencecountedsingletonfactory.h ('k') | webrtc/base/rtccertificate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/rtccertificate.h
diff --git a/webrtc/base/rtccertificate.h b/webrtc/base/rtccertificate.h
index 600739bc86a9211172337e3b88d189f95835b839..3d4f36e6a3e9886c70ba516bb77225929a1807b9 100644
--- a/webrtc/base/rtccertificate.h
+++ b/webrtc/base/rtccertificate.h
@@ -11,9 +11,10 @@
#ifndef WEBRTC_BASE_RTCCERTIFICATE_H_
#define WEBRTC_BASE_RTCCERTIFICATE_H_
+#include <memory>
+
#include "webrtc/base/basictypes.h"
#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/base/sslidentity.h"
@@ -25,7 +26,8 @@ namespace rtc {
class RTCCertificate : public RefCountInterface {
public:
// Takes ownership of |identity|.
- static scoped_refptr<RTCCertificate> Create(scoped_ptr<SSLIdentity> identity);
+ static scoped_refptr<RTCCertificate> Create(
+ std::unique_ptr<SSLIdentity> identity);
// Returns the expiration time in ms relative to epoch, 1970-01-01T00:00:00Z.
uint64_t Expires() const;
@@ -47,7 +49,7 @@ class RTCCertificate : public RefCountInterface {
private:
// The SSLIdentity is the owner of the SSLCertificate. To protect our
// ssl_certificate() we take ownership of |identity_|.
- scoped_ptr<SSLIdentity> identity_;
+ std::unique_ptr<SSLIdentity> identity_;
};
} // namespace rtc
« no previous file with comments | « webrtc/base/referencecountedsingletonfactory.h ('k') | webrtc/base/rtccertificate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698