Index: media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc |
diff --git a/media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc b/media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc |
index 348d8c3ada318db611626501770fb38f5b795842..182794fc4d682839966494cf1763f76739a6e25c 100644 |
--- a/media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc |
+++ b/media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc |
@@ -6,10 +6,11 @@ |
#include <stddef.h> |
#include <stdint.h> |
+ |
+#include <memory> |
#include <utility> |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/test/simple_test_tick_clock.h" |
#include "base/time/tick_clock.h" |
#include "media/base/fake_single_thread_task_runner.h" |
@@ -32,11 +33,11 @@ class ReceiverRtcpEventSubscriberTest : public ::testing::Test { |
ReceiverRtcpEventSubscriberTest() |
: testing_clock_(new base::SimpleTestTickClock()), |
task_runner_(new FakeSingleThreadTaskRunner(testing_clock_)), |
- cast_environment_( |
- new CastEnvironment(scoped_ptr<base::TickClock>(testing_clock_), |
- task_runner_, |
- task_runner_, |
- task_runner_)) {} |
+ cast_environment_(new CastEnvironment( |
+ std::unique_ptr<base::TickClock>(testing_clock_), |
+ task_runner_, |
+ task_runner_, |
+ task_runner_)) {} |
~ReceiverRtcpEventSubscriberTest() override {} |
@@ -55,7 +56,7 @@ class ReceiverRtcpEventSubscriberTest : public ::testing::Test { |
void InsertEvents() { |
// Video events |
- scoped_ptr<FrameEvent> playout_event(new FrameEvent()); |
+ std::unique_ptr<FrameEvent> playout_event(new FrameEvent()); |
playout_event->timestamp = testing_clock_->NowTicks(); |
playout_event->type = FRAME_PLAYOUT; |
playout_event->media_type = VIDEO_EVENT; |
@@ -64,7 +65,7 @@ class ReceiverRtcpEventSubscriberTest : public ::testing::Test { |
playout_event->delay_delta = base::TimeDelta::FromMilliseconds(kDelayMs); |
cast_environment_->logger()->DispatchFrameEvent(std::move(playout_event)); |
- scoped_ptr<FrameEvent> decode_event(new FrameEvent()); |
+ std::unique_ptr<FrameEvent> decode_event(new FrameEvent()); |
decode_event->timestamp = testing_clock_->NowTicks(); |
decode_event->type = FRAME_DECODED; |
decode_event->media_type = VIDEO_EVENT; |
@@ -72,7 +73,7 @@ class ReceiverRtcpEventSubscriberTest : public ::testing::Test { |
decode_event->frame_id = 1u; |
cast_environment_->logger()->DispatchFrameEvent(std::move(decode_event)); |
- scoped_ptr<PacketEvent> receive_event(new PacketEvent()); |
+ std::unique_ptr<PacketEvent> receive_event(new PacketEvent()); |
receive_event->timestamp = testing_clock_->NowTicks(); |
receive_event->type = PACKET_RECEIVED; |
receive_event->media_type = VIDEO_EVENT; |
@@ -113,7 +114,7 @@ class ReceiverRtcpEventSubscriberTest : public ::testing::Test { |
cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event)); |
// Unrelated events |
- scoped_ptr<FrameEvent> encode_event(new FrameEvent()); |
+ std::unique_ptr<FrameEvent> encode_event(new FrameEvent()); |
encode_event->timestamp = testing_clock_->NowTicks(); |
encode_event->type = FRAME_ENCODED; |
encode_event->media_type = VIDEO_EVENT; |
@@ -133,7 +134,7 @@ class ReceiverRtcpEventSubscriberTest : public ::testing::Test { |
base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment. |
scoped_refptr<FakeSingleThreadTaskRunner> task_runner_; |
scoped_refptr<CastEnvironment> cast_environment_; |
- scoped_ptr<ReceiverRtcpEventSubscriber> event_subscriber_; |
+ std::unique_ptr<ReceiverRtcpEventSubscriber> event_subscriber_; |
}; |
TEST_F(ReceiverRtcpEventSubscriberTest, LogVideoEvents) { |
@@ -158,7 +159,7 @@ TEST_F(ReceiverRtcpEventSubscriberTest, DropEventsWhenSizeExceeded) { |
Init(VIDEO_EVENT); |
for (uint32_t i = 1u; i <= 10u; ++i) { |
- scoped_ptr<FrameEvent> decode_event(new FrameEvent()); |
+ std::unique_ptr<FrameEvent> decode_event(new FrameEvent()); |
decode_event->timestamp = testing_clock_->NowTicks(); |
decode_event->type = FRAME_DECODED; |
decode_event->media_type = VIDEO_EVENT; |