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; |
}; |