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

Unified Diff: talk/app/webrtc/objc/RTCPeerConnection.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/RTCOpenGLVideoRenderer.mm ('k') | talk/app/webrtc/objc/RTCPeerConnectionFactory.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/app/webrtc/objc/RTCPeerConnection.mm
diff --git a/talk/app/webrtc/objc/RTCPeerConnection.mm b/talk/app/webrtc/objc/RTCPeerConnection.mm
index 0ec61814f31319c835153a7d9759c1a3f1365e5a..da092c80269b6c378bdb2aaf6f0a726bf70d7aa8 100644
--- a/talk/app/webrtc/objc/RTCPeerConnection.mm
+++ b/talk/app/webrtc/objc/RTCPeerConnection.mm
@@ -45,6 +45,8 @@
#import "RTCStatsDelegate.h"
#import "RTCStatsReport+Internal.h"
+#include <memory>
+
#include "webrtc/api/jsep.h"
NSString* const kRTCSessionDescriptionDelegateErrorDomain = @"RTCSDPError";
@@ -141,12 +143,12 @@ class RTCStatsObserver : public StatsObserver {
@implementation RTCPeerConnection {
NSMutableArray* _localStreams;
- rtc::scoped_ptr<webrtc::RTCPeerConnectionObserver> _observer;
+ std::unique_ptr<webrtc::RTCPeerConnectionObserver> _observer;
rtc::scoped_refptr<webrtc::PeerConnectionInterface> _peerConnection;
}
- (BOOL)addICECandidate:(RTCICECandidate*)candidate {
- rtc::scoped_ptr<const webrtc::IceCandidateInterface> iceCandidate(
+ std::unique_ptr<const webrtc::IceCandidateInterface> iceCandidate(
candidate.candidate);
return self.peerConnection->AddIceCandidate(iceCandidate.get());
}
« no previous file with comments | « talk/app/webrtc/objc/RTCOpenGLVideoRenderer.mm ('k') | talk/app/webrtc/objc/RTCPeerConnectionFactory.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698