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

Unified Diff: webrtc/pc/srtpfilter.h

Issue 1783263002: Replace scoped_ptr with unique_ptr in webrtc/pc/ (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 | « webrtc/pc/planarfunctions_unittest.cc ('k') | webrtc/pc/yuvscaler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/srtpfilter.h
diff --git a/webrtc/pc/srtpfilter.h b/webrtc/pc/srtpfilter.h
index 3a5ec281a2d4b411316a8d1bc9c9620801bf4f9a..f4c1d33dbfafe0077adc6376c00805fbf9ec7e42 100644
--- a/webrtc/pc/srtpfilter.h
+++ b/webrtc/pc/srtpfilter.h
@@ -13,12 +13,12 @@
#include <list>
#include <map>
+#include <memory>
#include <string>
#include <vector>
#include "webrtc/base/basictypes.h"
#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/sigslotrepeater.h"
#include "webrtc/base/sslstreamadapter.h"
#include "webrtc/media/base/cryptoparams.h"
@@ -167,10 +167,10 @@ class SrtpFilter {
State state_;
uint32_t signal_silent_time_in_ms_;
std::vector<CryptoParams> offer_params_;
- rtc::scoped_ptr<SrtpSession> send_session_;
- rtc::scoped_ptr<SrtpSession> recv_session_;
- rtc::scoped_ptr<SrtpSession> send_rtcp_session_;
- rtc::scoped_ptr<SrtpSession> recv_rtcp_session_;
+ std::unique_ptr<SrtpSession> send_session_;
+ std::unique_ptr<SrtpSession> recv_session_;
+ std::unique_ptr<SrtpSession> send_rtcp_session_;
+ std::unique_ptr<SrtpSession> recv_rtcp_session_;
CryptoParams applied_send_params_;
CryptoParams applied_recv_params_;
};
@@ -229,7 +229,7 @@ class SrtpSession {
srtp_ctx_t* session_;
int rtp_auth_tag_len_;
int rtcp_auth_tag_len_;
- rtc::scoped_ptr<SrtpStat> srtp_stat_;
+ std::unique_ptr<SrtpStat> srtp_stat_;
static bool inited_;
static rtc::GlobalLockPod lock_;
int last_send_seq_num_;
« no previous file with comments | « webrtc/pc/planarfunctions_unittest.cc ('k') | webrtc/pc/yuvscaler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698