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

Unified Diff: talk/app/webrtc/objc/RTCDataChannel.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/RTCAVFoundationVideoSource.mm ('k') | talk/app/webrtc/objc/RTCI420Frame.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/app/webrtc/objc/RTCDataChannel.mm
diff --git a/talk/app/webrtc/objc/RTCDataChannel.mm b/talk/app/webrtc/objc/RTCDataChannel.mm
index 00d51b10eeac6009edfa534915a5a2192ba7c005..114b916fb467e1c7255464242853e5783d83e48e 100644
--- a/talk/app/webrtc/objc/RTCDataChannel.mm
+++ b/talk/app/webrtc/objc/RTCDataChannel.mm
@@ -31,8 +31,9 @@
#import "RTCDataChannel+Internal.h"
+#include <memory>
+
#include "webrtc/api/datachannelinterface.h"
-#include "webrtc/base/scoped_ptr.h"
namespace webrtc {
@@ -146,7 +147,7 @@ std::string StdStringFromNSString(NSString* nsString) {
@end
@implementation RTCDataBuffer {
- rtc::scoped_ptr<webrtc::DataBuffer> _dataBuffer;
+ std::unique_ptr<webrtc::DataBuffer> _dataBuffer;
}
- (instancetype)initWithData:(NSData*)data isBinary:(BOOL)isBinary {
@@ -187,7 +188,7 @@ std::string StdStringFromNSString(NSString* nsString) {
@implementation RTCDataChannel {
rtc::scoped_refptr<webrtc::DataChannelInterface> _dataChannel;
- rtc::scoped_ptr<webrtc::RTCDataChannelObserver> _observer;
+ std::unique_ptr<webrtc::RTCDataChannelObserver> _observer;
BOOL _isObserverRegistered;
}
« no previous file with comments | « talk/app/webrtc/objc/RTCAVFoundationVideoSource.mm ('k') | talk/app/webrtc/objc/RTCI420Frame.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698