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

Unified Diff: media/cast/net/rtcp/rtcp_defines.h

Issue 1905763002: Convert //media/cast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « media/cast/net/rtcp/rtcp_builder_unittest.cc ('k') | media/cast/net/rtcp/rtcp_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/net/rtcp/rtcp_defines.h
diff --git a/media/cast/net/rtcp/rtcp_defines.h b/media/cast/net/rtcp/rtcp_defines.h
index 3455d4f5360491e6c687e0f91d9f5a85d0c20b98..aa87cf0a47743e7864a7aaa7c0d1394e6ab7c8dc 100644
--- a/media/cast/net/rtcp/rtcp_defines.h
+++ b/media/cast/net/rtcp/rtcp_defines.h
@@ -9,12 +9,12 @@
#include <stdint.h>
#include <list>
+#include <memory>
#include <utility>
#include <vector>
#include "base/callback_forward.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "media/cast/logging/logging_defines.h"
#include "media/cast/net/cast_transport_defines.h"
@@ -156,11 +156,11 @@ struct SendRtcpFromRtpReceiver_Params {
uint32_t ssrc;
uint32_t sender_ssrc;
RtcpTimeData time_data;
- scoped_ptr<RtcpCastMessage> cast_message;
- scoped_ptr<RtcpPliMessage> pli_message;
+ std::unique_ptr<RtcpCastMessage> cast_message;
+ std::unique_ptr<RtcpPliMessage> pli_message;
base::TimeDelta target_delay;
- scoped_ptr<std::vector<std::pair<RtpTimeTicks, RtcpEvent>>> rtcp_events;
- scoped_ptr<RtpReceiverStatistics> rtp_receiver_statistics;
+ std::unique_ptr<std::vector<std::pair<RtpTimeTicks, RtcpEvent>>> rtcp_events;
+ std::unique_ptr<RtpReceiverStatistics> rtp_receiver_statistics;
};
« no previous file with comments | « media/cast/net/rtcp/rtcp_builder_unittest.cc ('k') | media/cast/net/rtcp/rtcp_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698