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

Unified Diff: talk/app/webrtc/objc/RTCPeerConnectionInterface.mm

Issue 1785353003: Replace scoped_ptr with unique_ptr in talk/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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 | « talk/app/webrtc/objc/RTCPeerConnectionFactory+Internal.h ('k') | talk/app/webrtc/objc/RTCVideoCapturer.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/app/webrtc/objc/RTCPeerConnectionInterface.mm
diff --git a/talk/app/webrtc/objc/RTCPeerConnectionInterface.mm b/talk/app/webrtc/objc/RTCPeerConnectionInterface.mm
index 8cbb5883516dadb664578c27ff4cd30a983c91e0..0d8c3aec5237b12a813283d683a800b7147b1809 100644
--- a/talk/app/webrtc/objc/RTCPeerConnectionInterface.mm
+++ b/talk/app/webrtc/objc/RTCPeerConnectionInterface.mm
@@ -31,6 +31,8 @@
#import "talk/app/webrtc/objc/RTCICEServer+Internal.h"
#import "talk/app/webrtc/objc/public/RTCLogging.h"
+#include <memory>
+
@implementation RTCConfiguration
@synthesize iceTransportsType = _iceTransportsType;
@@ -95,11 +97,12 @@
nativeConfig.ice_connection_receiving_timeout = _iceConnectionReceivingTimeout;
nativeConfig.ice_backup_candidate_pair_ping_interval = _iceBackupCandidatePairPingInterval;
if (_keyType == kRTCEncryptionKeyTypeECDSA) {
- rtc::scoped_ptr<rtc::SSLIdentity> identity(
+ std::unique_ptr<rtc::SSLIdentity> identity(
rtc::SSLIdentity::Generate(webrtc::kIdentityName, rtc::KT_ECDSA));
if (identity) {
nativeConfig.certificates.push_back(
- rtc::RTCCertificate::Create(std::move(identity)));
+ rtc::RTCCertificate::Create(
+ rtc::UniqueToScoped(std::move(identity))));
} else {
RTCLogWarning(@"Failed to generate ECDSA identity. RSA will be used.");
}
« no previous file with comments | « talk/app/webrtc/objc/RTCPeerConnectionFactory+Internal.h ('k') | talk/app/webrtc/objc/RTCVideoCapturer.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698