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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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_sender_impl.cc » ('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 6416ae68b69afd5b691c5ae2134e43a2751b4be9..7acfddda21d6482b7c5d0cfee66430f7bb3a3577 100644
--- a/media/cast/logging/stats_event_subscriber_unittest.cc
+++ b/media/cast/logging/stats_event_subscriber_unittest.cc
@@ -2,8 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "media/cast/logging/stats_event_subscriber.h"
+
#include <stddef.h>
#include <stdint.h>
+#include <utility>
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
@@ -13,7 +16,6 @@
#include "base/values.h"
#include "media/cast/cast_environment.h"
#include "media/cast/logging/logging_defines.h"
-#include "media/cast/logging/stats_event_subscriber.h"
#include "media/cast/test/fake_receiver_time_offset_estimator.h"
#include "media/cast/test/fake_single_thread_task_runner.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -30,11 +32,11 @@ class StatsEventSubscriberTest : public ::testing::Test {
StatsEventSubscriberTest()
: sender_clock_(new base::SimpleTestTickClock()),
task_runner_(new test::FakeSingleThreadTaskRunner(sender_clock_)),
- cast_environment_(new CastEnvironment(
- scoped_ptr<base::TickClock>(sender_clock_).Pass(),
- task_runner_,
- task_runner_,
- task_runner_)),
+ cast_environment_(
+ new CastEnvironment(scoped_ptr<base::TickClock>(sender_clock_),
+ task_runner_,
+ task_runner_,
+ task_runner_)),
fake_offset_estimator_(
base::TimeDelta::FromSeconds(kReceiverOffsetSecs)) {
receiver_clock_.Advance(base::TimeDelta::FromSeconds(kReceiverOffsetSecs));
@@ -85,7 +87,8 @@ TEST_F(StatsEventSubscriberTest, CaptureEncode) {
capture_begin_event->type = FRAME_CAPTURE_BEGIN;
capture_begin_event->media_type = VIDEO_EVENT;
capture_begin_event->rtp_timestamp = rtp_timestamp;
- cast_environment_->logger()->DispatchFrameEvent(capture_begin_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(
+ std::move(capture_begin_event));
AdvanceClocks(base::TimeDelta::FromMicroseconds(10));
scoped_ptr<FrameEvent> capture_end_event(new FrameEvent());
@@ -93,7 +96,8 @@ TEST_F(StatsEventSubscriberTest, CaptureEncode) {
capture_end_event->type = FRAME_CAPTURE_END;
capture_end_event->media_type = VIDEO_EVENT;
capture_end_event->rtp_timestamp = rtp_timestamp;
- cast_environment_->logger()->DispatchFrameEvent(capture_end_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(
+ std::move(capture_end_event));
if (i % 2 == 0) {
AdvanceClocks(base::TimeDelta::FromMicroseconds(10));
@@ -108,7 +112,7 @@ TEST_F(StatsEventSubscriberTest, CaptureEncode) {
encode_event->target_bitrate = 5678;
encode_event->encoder_cpu_utilization = 9.10;
encode_event->idealized_bitrate_utilization = 11.12;
- cast_environment_->logger()->DispatchFrameEvent(encode_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(encode_event));
} else if (i < extra_frames) {
dropped_frames++;
}
@@ -172,7 +176,7 @@ TEST_F(StatsEventSubscriberTest, Encode) {
encode_event->target_bitrate = 5678;
encode_event->encoder_cpu_utilization = 9.10;
encode_event->idealized_bitrate_utilization = 11.12;
- cast_environment_->logger()->DispatchFrameEvent(encode_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(encode_event));
last_event_time = sender_clock_->NowTicks();
AdvanceClocks(base::TimeDelta::FromMicroseconds(35678));
@@ -229,7 +233,7 @@ TEST_F(StatsEventSubscriberTest, Decode) {
decode_event->media_type = VIDEO_EVENT;
decode_event->rtp_timestamp = rtp_timestamp;
decode_event->frame_id = frame_id;
- cast_environment_->logger()->DispatchFrameEvent(decode_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(decode_event));
AdvanceClocks(base::TimeDelta::FromMicroseconds(36789));
rtp_timestamp += 90;
@@ -269,7 +273,7 @@ TEST_F(StatsEventSubscriberTest, PlayoutDelay) {
playout_event->rtp_timestamp = rtp_timestamp;
playout_event->frame_id = frame_id;
playout_event->delay_delta = delay;
- cast_environment_->logger()->DispatchFrameEvent(playout_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(playout_event));
AdvanceClocks(base::TimeDelta::FromMicroseconds(37890));
rtp_timestamp += 90;
@@ -299,7 +303,8 @@ TEST_F(StatsEventSubscriberTest, E2ELatency) {
capture_begin_event->type = FRAME_CAPTURE_BEGIN;
capture_begin_event->media_type = VIDEO_EVENT;
capture_begin_event->rtp_timestamp = rtp_timestamp;
- cast_environment_->logger()->DispatchFrameEvent(capture_begin_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(
+ std::move(capture_begin_event));
int latency_micros = 100000 + base::RandInt(-5000, 50000);
base::TimeDelta latency = base::TimeDelta::FromMicroseconds(latency_micros);
@@ -316,7 +321,7 @@ TEST_F(StatsEventSubscriberTest, E2ELatency) {
playout_event->rtp_timestamp = rtp_timestamp;
playout_event->frame_id = frame_id;
playout_event->delay_delta = delay;
- cast_environment_->logger()->DispatchFrameEvent(playout_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(playout_event));
rtp_timestamp += 90;
frame_id++;
@@ -358,7 +363,7 @@ TEST_F(StatsEventSubscriberTest, Packets) {
encode_event->media_type = VIDEO_EVENT;
encode_event->rtp_timestamp = rtp_timestamp;
encode_event->frame_id = 0;
- cast_environment_->logger()->DispatchFrameEvent(encode_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(encode_event));
// Every 2nd packet will be retransmitted once.
// Every 4th packet will be retransmitted twice.
@@ -376,7 +381,7 @@ TEST_F(StatsEventSubscriberTest, Packets) {
send_event->packet_id = i;
send_event->max_packet_id = num_packets - 1;
send_event->size = size;
- cast_environment_->logger()->DispatchPacketEvent(send_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(std::move(send_event));
num_packets_transmitted++;
total_queueing_latency += sender_clock_->NowTicks() - sender_encoded_time;
@@ -407,7 +412,8 @@ TEST_F(StatsEventSubscriberTest, Packets) {
retransmit_event->packet_id = i;
retransmit_event->max_packet_id = num_packets - 1;
retransmit_event->size = size;
- cast_environment_->logger()->DispatchPacketEvent(retransmit_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(
+ std::move(retransmit_event));
retransmit_total_size += size;
num_packets_transmitted++;
@@ -426,7 +432,8 @@ TEST_F(StatsEventSubscriberTest, Packets) {
retransmit_event->packet_id = i;
retransmit_event->max_packet_id = num_packets - 1;
retransmit_event->size = size;
- cast_environment_->logger()->DispatchPacketEvent(retransmit_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(
+ std::move(retransmit_event));
retransmit_total_size += size;
num_packets_transmitted++;
@@ -445,7 +452,8 @@ TEST_F(StatsEventSubscriberTest, Packets) {
retransmit_event->packet_id = i;
retransmit_event->max_packet_id = num_packets - 1;
retransmit_event->size = size;
- cast_environment_->logger()->DispatchPacketEvent(retransmit_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(
+ std::move(retransmit_event));
scoped_ptr<PacketEvent> reject_event(new PacketEvent());
reject_event->timestamp = receiver_clock_.NowTicks();
@@ -456,7 +464,7 @@ TEST_F(StatsEventSubscriberTest, Packets) {
reject_event->packet_id = i;
reject_event->max_packet_id = num_packets - 1;
reject_event->size = size;
- cast_environment_->logger()->DispatchPacketEvent(reject_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(std::move(reject_event));
retransmit_total_size += size;
num_packets_transmitted++;
@@ -473,7 +481,7 @@ TEST_F(StatsEventSubscriberTest, Packets) {
receive_event->packet_id = i;
receive_event->max_packet_id = num_packets - 1;
receive_event->size = size;
- cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event));
num_packets_received++;
}
@@ -574,7 +582,8 @@ TEST_F(StatsEventSubscriberTest, Histograms) {
capture_begin_event->type = FRAME_CAPTURE_BEGIN;
capture_begin_event->media_type = VIDEO_EVENT;
capture_begin_event->rtp_timestamp = rtp_timestamp;
- cast_environment_->logger()->DispatchFrameEvent(capture_begin_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(
+ std::move(capture_begin_event));
AdvanceClocks(base::TimeDelta::FromMilliseconds(10));
scoped_ptr<FrameEvent> capture_end_event(new FrameEvent());
@@ -582,7 +591,8 @@ TEST_F(StatsEventSubscriberTest, Histograms) {
capture_end_event->type = FRAME_CAPTURE_END;
capture_end_event->media_type = VIDEO_EVENT;
capture_end_event->rtp_timestamp = rtp_timestamp;
- cast_environment_->logger()->DispatchFrameEvent(capture_end_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(
+ std::move(capture_end_event));
AdvanceClocks(base::TimeDelta::FromMilliseconds(15));
scoped_ptr<FrameEvent> encode_event(new FrameEvent());
@@ -596,7 +606,7 @@ TEST_F(StatsEventSubscriberTest, Histograms) {
encode_event->target_bitrate = 5678;
encode_event->encoder_cpu_utilization = 9.10;
encode_event->idealized_bitrate_utilization = 11.12;
- cast_environment_->logger()->DispatchFrameEvent(encode_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(encode_event));
}
// Send 3 packets for the last frame.
@@ -612,7 +622,7 @@ TEST_F(StatsEventSubscriberTest, Histograms) {
send_event->packet_id = i;
send_event->max_packet_id = 2;
send_event->size = 123;
- cast_environment_->logger()->DispatchPacketEvent(send_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(std::move(send_event));
}
// Receive 3 packets for the last frame.
@@ -629,7 +639,7 @@ TEST_F(StatsEventSubscriberTest, Histograms) {
receive_event->packet_id = i;
receive_event->max_packet_id = 2;
receive_event->size = 123;
- cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event));
}
scoped_ptr<FrameEvent> playout_event(new FrameEvent());
@@ -639,7 +649,7 @@ TEST_F(StatsEventSubscriberTest, Histograms) {
playout_event->rtp_timestamp = rtp_timestamp;
playout_event->frame_id = frame_id;
playout_event->delay_delta = base::TimeDelta::FromMilliseconds(100);
- cast_environment_->logger()->DispatchFrameEvent(playout_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(playout_event));
StatsEventSubscriber::SimpleHistogram* histogram;
scoped_ptr<base::ListValue> values;
@@ -647,19 +657,19 @@ TEST_F(StatsEventSubscriberTest, Histograms) {
histogram = subscriber_->GetHistogramForTesting(
StatsEventSubscriber::CAPTURE_LATENCY_MS_HISTO);
ASSERT_TRUE(histogram);
- values = histogram->GetHistogram().Pass();
+ values = histogram->GetHistogram();
EXPECT_TRUE(CheckHistogramHasValue(values.get(), "10-14", 10));
histogram = subscriber_->GetHistogramForTesting(
StatsEventSubscriber::ENCODE_TIME_MS_HISTO);
ASSERT_TRUE(histogram);
- values = histogram->GetHistogram().Pass();
+ values = histogram->GetHistogram();
EXPECT_TRUE(CheckHistogramHasValue(values.get(), "15-19", 10));
histogram = subscriber_->GetHistogramForTesting(
StatsEventSubscriber::QUEUEING_LATENCY_MS_HISTO);
ASSERT_TRUE(histogram);
- values = histogram->GetHistogram().Pass();
+ values = histogram->GetHistogram();
EXPECT_TRUE(CheckHistogramHasValue(values.get(), "100-119", 1));
EXPECT_TRUE(CheckHistogramHasValue(values.get(), "200-219", 1));
EXPECT_TRUE(CheckHistogramHasValue(values.get(), "300-319", 1));
@@ -667,7 +677,7 @@ TEST_F(StatsEventSubscriberTest, Histograms) {
histogram = subscriber_->GetHistogramForTesting(
StatsEventSubscriber::NETWORK_LATENCY_MS_HISTO);
ASSERT_TRUE(histogram);
- values = histogram->GetHistogram().Pass();
+ values = histogram->GetHistogram();
EXPECT_TRUE(CheckHistogramHasValue(values.get(), "100-119", 1));
EXPECT_TRUE(CheckHistogramHasValue(values.get(), "200-219", 1));
EXPECT_TRUE(CheckHistogramHasValue(values.get(), "300-319", 1));
@@ -675,13 +685,13 @@ TEST_F(StatsEventSubscriberTest, Histograms) {
histogram = subscriber_->GetHistogramForTesting(
StatsEventSubscriber::PACKET_LATENCY_MS_HISTO);
ASSERT_TRUE(histogram);
- values = histogram->GetHistogram().Pass();
+ values = histogram->GetHistogram();
EXPECT_TRUE(CheckHistogramHasValue(values.get(), "400-419", 3));
histogram = subscriber_->GetHistogramForTesting(
StatsEventSubscriber::LATE_FRAME_MS_HISTO);
ASSERT_TRUE(histogram);
- values = histogram->GetHistogram().Pass();
+ values = histogram->GetHistogram();
EXPECT_TRUE(CheckHistogramHasValue(values.get(), "100-119", 1));
}
« no previous file with comments | « media/cast/logging/stats_event_subscriber.cc ('k') | media/cast/net/cast_transport_sender_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698