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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/cast/logging/stats_event_subscriber_unittest.cc

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/logging/stats_event_subscriber.cc ('k') | media/cast/net/cast_transport.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/logging/stats_event_subscriber_unittest.cc
diff --git a/media/cast/logging/stats_event_subscriber_unittest.cc b/media/cast/logging/stats_event_subscriber_unittest.cc
index 1cf818bac834bdf12e6824325f766278bf50714c..194dd3d37c92ed248cafc1d4413927058a754fc6 100644
--- a/media/cast/logging/stats_event_subscriber_unittest.cc
+++ b/media/cast/logging/stats_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/rand_util.h"
#include "base/test/simple_test_tick_clock.h"
#include "base/time/tick_clock.h"
@@ -33,7 +34,7 @@ class StatsEventSubscriberTest : public ::testing::Test {
: sender_clock_(new base::SimpleTestTickClock()),
task_runner_(new FakeSingleThreadTaskRunner(sender_clock_)),
cast_environment_(
- new CastEnvironment(scoped_ptr<base::TickClock>(sender_clock_),
+ new CastEnvironment(std::unique_ptr<base::TickClock>(sender_clock_),
task_runner_,
task_runner_,
task_runner_)),
@@ -66,7 +67,7 @@ class StatsEventSubscriberTest : public ::testing::Test {
scoped_refptr<FakeSingleThreadTaskRunner> task_runner_;
scoped_refptr<CastEnvironment> cast_environment_;
test::FakeReceiverTimeOffsetEstimator fake_offset_estimator_;
- scoped_ptr<StatsEventSubscriber> subscriber_;
+ std::unique_ptr<StatsEventSubscriber> subscriber_;
};
TEST_F(StatsEventSubscriberTest, CaptureEncode) {
@@ -82,7 +83,7 @@ TEST_F(StatsEventSubscriberTest, CaptureEncode) {
base::TimeTicks start_time = sender_clock_->NowTicks();
// Drop half the frames during the encode step.
for (int i = 0; i < num_frames; i++) {
- scoped_ptr<FrameEvent> capture_begin_event(new FrameEvent());
+ std::unique_ptr<FrameEvent> capture_begin_event(new FrameEvent());
capture_begin_event->timestamp = sender_clock_->NowTicks();
capture_begin_event->type = FRAME_CAPTURE_BEGIN;
capture_begin_event->media_type = VIDEO_EVENT;
@@ -91,7 +92,7 @@ TEST_F(StatsEventSubscriberTest, CaptureEncode) {
std::move(capture_begin_event));
AdvanceClocks(base::TimeDelta::FromMicroseconds(10));
- scoped_ptr<FrameEvent> capture_end_event(new FrameEvent());
+ std::unique_ptr<FrameEvent> capture_end_event(new FrameEvent());
capture_end_event->timestamp = sender_clock_->NowTicks();
capture_end_event->type = FRAME_CAPTURE_END;
capture_end_event->media_type = VIDEO_EVENT;
@@ -101,7 +102,7 @@ TEST_F(StatsEventSubscriberTest, CaptureEncode) {
if (i % 2 == 0) {
AdvanceClocks(base::TimeDelta::FromMicroseconds(10));
- scoped_ptr<FrameEvent> encode_event(new FrameEvent());
+ std::unique_ptr<FrameEvent> encode_event(new FrameEvent());
encode_event->timestamp = sender_clock_->NowTicks();
encode_event->type = FRAME_ENCODED;
encode_event->media_type = VIDEO_EVENT;
@@ -165,7 +166,7 @@ TEST_F(StatsEventSubscriberTest, Encode) {
for (int i = 0; i < num_frames; i++) {
int size = 1000 + base::RandInt(-100, 100);
total_size += size;
- scoped_ptr<FrameEvent> encode_event(new FrameEvent());
+ std::unique_ptr<FrameEvent> encode_event(new FrameEvent());
encode_event->timestamp = sender_clock_->NowTicks();
encode_event->type = FRAME_ENCODED;
encode_event->media_type = VIDEO_EVENT;
@@ -227,7 +228,7 @@ TEST_F(StatsEventSubscriberTest, Decode) {
int num_frames = 10;
base::TimeTicks start_time = sender_clock_->NowTicks();
for (int i = 0; i < num_frames; i++) {
- scoped_ptr<FrameEvent> decode_event(new FrameEvent());
+ std::unique_ptr<FrameEvent> decode_event(new FrameEvent());
decode_event->timestamp = receiver_clock_.NowTicks();
decode_event->type = FRAME_DECODED;
decode_event->media_type = VIDEO_EVENT;
@@ -266,7 +267,7 @@ TEST_F(StatsEventSubscriberTest, PlayoutDelay) {
base::TimeDelta delay = base::TimeDelta::FromMilliseconds(delay_ms);
if (delay_ms > 0)
late_frames++;
- scoped_ptr<FrameEvent> playout_event(new FrameEvent());
+ std::unique_ptr<FrameEvent> playout_event(new FrameEvent());
playout_event->timestamp = receiver_clock_.NowTicks();
playout_event->type = FRAME_PLAYOUT;
playout_event->media_type = VIDEO_EVENT;
@@ -298,7 +299,7 @@ TEST_F(StatsEventSubscriberTest, E2ELatency) {
int num_frames = 10;
base::TimeDelta total_latency;
for (int i = 0; i < num_frames; i++) {
- scoped_ptr<FrameEvent> capture_begin_event(new FrameEvent());
+ std::unique_ptr<FrameEvent> capture_begin_event(new FrameEvent());
capture_begin_event->timestamp = sender_clock_->NowTicks();
capture_begin_event->type = FRAME_CAPTURE_BEGIN;
capture_begin_event->media_type = VIDEO_EVENT;
@@ -314,7 +315,7 @@ TEST_F(StatsEventSubscriberTest, E2ELatency) {
base::TimeDelta delay = base::TimeDelta::FromMilliseconds(delay_micros);
total_latency += latency;
- scoped_ptr<FrameEvent> playout_event(new FrameEvent());
+ std::unique_ptr<FrameEvent> playout_event(new FrameEvent());
playout_event->timestamp = receiver_clock_.NowTicks();
playout_event->type = FRAME_PLAYOUT;
playout_event->media_type = VIDEO_EVENT;
@@ -357,7 +358,7 @@ TEST_F(StatsEventSubscriberTest, Packets) {
base::TimeTicks sender_encoded_time = sender_clock_->NowTicks();
base::TimeTicks receiver_encoded_time = receiver_clock_.NowTicks();
- scoped_ptr<FrameEvent> encode_event(new FrameEvent());
+ std::unique_ptr<FrameEvent> encode_event(new FrameEvent());
encode_event->timestamp = sender_encoded_time;
encode_event->type = FRAME_ENCODED;
encode_event->media_type = VIDEO_EVENT;
@@ -372,7 +373,7 @@ TEST_F(StatsEventSubscriberTest, Packets) {
int size = 1000 + base::RandInt(-100, 100);
total_size += size;
- scoped_ptr<PacketEvent> send_event(new PacketEvent());
+ std::unique_ptr<PacketEvent> send_event(new PacketEvent());
send_event->timestamp = sender_clock_->NowTicks();
send_event->type = PACKET_SENT_TO_NETWORK;
send_event->media_type = VIDEO_EVENT;
@@ -403,7 +404,7 @@ TEST_F(StatsEventSubscriberTest, Packets) {
// Retransmission 1.
AdvanceClocks(base::TimeDelta::FromMicroseconds(12345));
if (i % 2 == 0) {
- scoped_ptr<PacketEvent> retransmit_event(new PacketEvent());
+ std::unique_ptr<PacketEvent> retransmit_event(new PacketEvent());
retransmit_event->timestamp = receiver_clock_.NowTicks();
retransmit_event->type = PACKET_RETRANSMITTED;
retransmit_event->media_type = VIDEO_EVENT;
@@ -423,7 +424,7 @@ TEST_F(StatsEventSubscriberTest, Packets) {
// Retransmission 2.
AdvanceClocks(base::TimeDelta::FromMicroseconds(13456));
if (i % 4 == 0) {
- scoped_ptr<PacketEvent> retransmit_event(new PacketEvent());
+ std::unique_ptr<PacketEvent> retransmit_event(new PacketEvent());
retransmit_event->timestamp = receiver_clock_.NowTicks();
retransmit_event->type = PACKET_RETRANSMITTED;
retransmit_event->media_type = VIDEO_EVENT;
@@ -443,7 +444,7 @@ TEST_F(StatsEventSubscriberTest, Packets) {
// Retransmission 3.
AdvanceClocks(base::TimeDelta::FromMicroseconds(14567));
if (i % 8 == 0) {
- scoped_ptr<PacketEvent> retransmit_event(new PacketEvent());
+ std::unique_ptr<PacketEvent> retransmit_event(new PacketEvent());
retransmit_event->timestamp = receiver_clock_.NowTicks();
retransmit_event->type = PACKET_RETRANSMITTED;
retransmit_event->media_type = VIDEO_EVENT;
@@ -455,7 +456,7 @@ TEST_F(StatsEventSubscriberTest, Packets) {
cast_environment_->logger()->DispatchPacketEvent(
std::move(retransmit_event));
- scoped_ptr<PacketEvent> reject_event(new PacketEvent());
+ std::unique_ptr<PacketEvent> reject_event(new PacketEvent());
reject_event->timestamp = receiver_clock_.NowTicks();
reject_event->type = PACKET_RTX_REJECTED;
reject_event->media_type = VIDEO_EVENT;
@@ -472,7 +473,7 @@ TEST_F(StatsEventSubscriberTest, Packets) {
num_packets_rtx_rejected++;
}
- scoped_ptr<PacketEvent> receive_event(new PacketEvent());
+ std::unique_ptr<PacketEvent> receive_event(new PacketEvent());
receive_event->timestamp = received_time;
receive_event->type = PACKET_RECEIVED;
receive_event->media_type = VIDEO_EVENT;
@@ -577,7 +578,7 @@ TEST_F(StatsEventSubscriberTest, Histograms) {
++frame_id;
rtp_timestamp += RtpTimeDelta::FromTicks(1);
- scoped_ptr<FrameEvent> capture_begin_event(new FrameEvent());
+ std::unique_ptr<FrameEvent> capture_begin_event(new FrameEvent());
capture_begin_event->timestamp = sender_clock_->NowTicks();
capture_begin_event->type = FRAME_CAPTURE_BEGIN;
capture_begin_event->media_type = VIDEO_EVENT;
@@ -586,7 +587,7 @@ TEST_F(StatsEventSubscriberTest, Histograms) {
std::move(capture_begin_event));
AdvanceClocks(base::TimeDelta::FromMilliseconds(10));
- scoped_ptr<FrameEvent> capture_end_event(new FrameEvent());
+ std::unique_ptr<FrameEvent> capture_end_event(new FrameEvent());
capture_end_event->timestamp = sender_clock_->NowTicks();
capture_end_event->type = FRAME_CAPTURE_END;
capture_end_event->media_type = VIDEO_EVENT;
@@ -595,7 +596,7 @@ TEST_F(StatsEventSubscriberTest, Histograms) {
std::move(capture_end_event));
AdvanceClocks(base::TimeDelta::FromMilliseconds(15));
- scoped_ptr<FrameEvent> encode_event(new FrameEvent());
+ std::unique_ptr<FrameEvent> encode_event(new FrameEvent());
encode_event->timestamp = sender_clock_->NowTicks();
encode_event->type = FRAME_ENCODED;
encode_event->media_type = VIDEO_EVENT;
@@ -613,7 +614,7 @@ TEST_F(StatsEventSubscriberTest, Histograms) {
// Queueing latencies are 100ms, 200ms and 300ms.
for (int i = 0; i < 3; ++i) {
AdvanceClocks(base::TimeDelta::FromMilliseconds(100));
- scoped_ptr<PacketEvent> send_event(new PacketEvent());
+ std::unique_ptr<PacketEvent> send_event(new PacketEvent());
send_event->timestamp = sender_clock_->NowTicks();
send_event->type = PACKET_SENT_TO_NETWORK;
send_event->media_type = VIDEO_EVENT;
@@ -630,7 +631,7 @@ TEST_F(StatsEventSubscriberTest, Histograms) {
// Packet latencies are 400ms.
AdvanceClocks(base::TimeDelta::FromMilliseconds(100));
for (int i = 0; i < 3; ++i) {
- scoped_ptr<PacketEvent> receive_event(new PacketEvent());
+ std::unique_ptr<PacketEvent> receive_event(new PacketEvent());
receive_event->timestamp = receiver_clock_.NowTicks();
receive_event->type = PACKET_RECEIVED;
receive_event->media_type = VIDEO_EVENT;
@@ -642,7 +643,7 @@ TEST_F(StatsEventSubscriberTest, Histograms) {
cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event));
}
- scoped_ptr<FrameEvent> playout_event(new FrameEvent());
+ std::unique_ptr<FrameEvent> playout_event(new FrameEvent());
playout_event->timestamp = receiver_clock_.NowTicks();
playout_event->type = FRAME_PLAYOUT;
playout_event->media_type = VIDEO_EVENT;
@@ -652,7 +653,7 @@ TEST_F(StatsEventSubscriberTest, Histograms) {
cast_environment_->logger()->DispatchFrameEvent(std::move(playout_event));
StatsEventSubscriber::SimpleHistogram* histogram;
- scoped_ptr<base::ListValue> values;
+ std::unique_ptr<base::ListValue> values;
histogram = subscriber_->GetHistogramForTesting(
StatsEventSubscriber::CAPTURE_LATENCY_MS_HISTO);
« no previous file with comments | « media/cast/logging/stats_event_subscriber.cc ('k') | media/cast/net/cast_transport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698