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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/cast/logging/receiver_time_offset_estimator_impl_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/log_event_dispatcher.cc ('k') | media/cast/logging/simple_event_subscriber_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc
diff --git a/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc b/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc
index 7cff1f01de7a651a3ff30e49773111939dce03e7..73ddd623dc90f9dfdeee9d3f6c4da815f0a736d4 100644
--- a/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc
+++ b/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc
@@ -2,7 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "media/cast/logging/receiver_time_offset_estimator_impl.h"
+
#include <stdint.h>
+#include <utility>
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
@@ -10,7 +13,6 @@
#include "base/time/tick_clock.h"
#include "media/cast/cast_environment.h"
#include "media/cast/logging/logging_defines.h"
-#include "media/cast/logging/receiver_time_offset_estimator_impl.h"
#include "media/cast/test/fake_single_thread_task_runner.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -22,11 +24,11 @@ class ReceiverTimeOffsetEstimatorImplTest : public ::testing::Test {
ReceiverTimeOffsetEstimatorImplTest()
: 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_)) {
cast_environment_->logger()->Subscribe(&estimator_);
}
@@ -76,7 +78,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, EstimateOffset) {
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));
scoped_ptr<PacketEvent> send_event(new PacketEvent());
send_event->timestamp = sender_clock_->NowTicks();
@@ -87,7 +89,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, EstimateOffset) {
send_event->packet_id = 56;
send_event->max_packet_id = 78;
send_event->size = 1500;
- cast_environment_->logger()->DispatchPacketEvent(send_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(std::move(send_event));
EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
@@ -98,7 +100,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, EstimateOffset) {
ack_sent_event->media_type = VIDEO_EVENT;
ack_sent_event->rtp_timestamp = rtp_timestamp;
ack_sent_event->frame_id = frame_id;
- cast_environment_->logger()->DispatchFrameEvent(ack_sent_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(ack_sent_event));
scoped_ptr<PacketEvent> receive_event(new PacketEvent());
receive_event->timestamp = receiver_clock_.NowTicks();
@@ -109,7 +111,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, EstimateOffset) {
receive_event->packet_id = 56;
receive_event->max_packet_id = 78;
receive_event->size = 1500;
- cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event));
EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
@@ -120,7 +122,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, EstimateOffset) {
ack_event->media_type = VIDEO_EVENT;
ack_event->rtp_timestamp = rtp_timestamp;
ack_event->frame_id = frame_id;
- cast_environment_->logger()->DispatchFrameEvent(ack_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(ack_event));
EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
@@ -159,7 +161,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, EventCArrivesBeforeEventB) {
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));
scoped_ptr<PacketEvent> send_event(new PacketEvent());
send_event->timestamp = sender_clock_->NowTicks();
@@ -170,7 +172,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, EventCArrivesBeforeEventB) {
send_event->packet_id = 56;
send_event->max_packet_id = 78;
send_event->size = 1500;
- cast_environment_->logger()->DispatchPacketEvent(send_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(std::move(send_event));
EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
@@ -185,7 +187,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, EventCArrivesBeforeEventB) {
ack_event->media_type = VIDEO_EVENT;
ack_event->rtp_timestamp = rtp_timestamp;
ack_event->frame_id = frame_id;
- cast_environment_->logger()->DispatchFrameEvent(ack_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(ack_event));
EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
@@ -198,7 +200,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, EventCArrivesBeforeEventB) {
receive_event->packet_id = 56;
receive_event->max_packet_id = 78;
receive_event->size = 1500;
- cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event));
scoped_ptr<FrameEvent> ack_sent_event(new FrameEvent());
ack_sent_event->timestamp = event_b_time;
@@ -206,7 +208,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, EventCArrivesBeforeEventB) {
ack_sent_event->media_type = VIDEO_EVENT;
ack_sent_event->rtp_timestamp = rtp_timestamp;
ack_sent_event->frame_id = frame_id;
- cast_environment_->logger()->DispatchFrameEvent(ack_sent_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(ack_sent_event));
EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
@@ -249,7 +251,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, MultipleIterations) {
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));
scoped_ptr<PacketEvent> send_event(new PacketEvent());
send_event->timestamp = sender_clock_->NowTicks();
@@ -260,7 +262,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, MultipleIterations) {
send_event->packet_id = 56;
send_event->max_packet_id = 78;
send_event->size = 1500;
- cast_environment_->logger()->DispatchPacketEvent(send_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(std::move(send_event));
AdvanceClocks(base::TimeDelta::FromMilliseconds(10));
encode_event.reset(new FrameEvent());
@@ -274,7 +276,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, MultipleIterations) {
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_event.reset(new PacketEvent());
send_event->timestamp = sender_clock_->NowTicks();
@@ -285,7 +287,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, MultipleIterations) {
send_event->packet_id = 56;
send_event->max_packet_id = 78;
send_event->size = 1500;
- cast_environment_->logger()->DispatchPacketEvent(send_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(std::move(send_event));
scoped_ptr<FrameEvent> ack_sent_event(new FrameEvent());
ack_sent_event->timestamp = receiver_clock_.NowTicks();
@@ -293,7 +295,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, MultipleIterations) {
ack_sent_event->media_type = VIDEO_EVENT;
ack_sent_event->rtp_timestamp = rtp_timestamp_a;
ack_sent_event->frame_id = frame_id_a;
- cast_environment_->logger()->DispatchFrameEvent(ack_sent_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(ack_sent_event));
AdvanceClocks(base::TimeDelta::FromMilliseconds(20));
@@ -306,7 +308,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, MultipleIterations) {
receive_event->packet_id = 56;
receive_event->max_packet_id = 78;
receive_event->size = 1500;
- cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event));
ack_sent_event.reset(new FrameEvent());
ack_sent_event->timestamp = receiver_clock_.NowTicks();
@@ -314,7 +316,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, MultipleIterations) {
ack_sent_event->media_type = VIDEO_EVENT;
ack_sent_event->rtp_timestamp = rtp_timestamp_b;
ack_sent_event->frame_id = frame_id_b;
- cast_environment_->logger()->DispatchFrameEvent(ack_sent_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(ack_sent_event));
AdvanceClocks(base::TimeDelta::FromMilliseconds(5));
scoped_ptr<FrameEvent> ack_event(new FrameEvent());
@@ -323,7 +325,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, MultipleIterations) {
ack_event->media_type = VIDEO_EVENT;
ack_event->rtp_timestamp = rtp_timestamp_b;
ack_event->frame_id = frame_id_b;
- cast_environment_->logger()->DispatchFrameEvent(ack_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(ack_event));
AdvanceClocks(base::TimeDelta::FromMilliseconds(5));
ack_event.reset(new FrameEvent());
@@ -332,7 +334,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, MultipleIterations) {
ack_event->media_type = VIDEO_EVENT;
ack_event->rtp_timestamp = rtp_timestamp_a;
ack_event->frame_id = frame_id_a;
- cast_environment_->logger()->DispatchFrameEvent(ack_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(ack_event));
AdvanceClocks(base::TimeDelta::FromMilliseconds(17));
encode_event.reset(new FrameEvent());
@@ -346,7 +348,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, MultipleIterations) {
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_event.reset(new PacketEvent());
send_event->timestamp = sender_clock_->NowTicks();
@@ -357,7 +359,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, MultipleIterations) {
send_event->packet_id = 56;
send_event->max_packet_id = 78;
send_event->size = 1500;
- cast_environment_->logger()->DispatchPacketEvent(send_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(std::move(send_event));
AdvanceClocks(base::TimeDelta::FromMilliseconds(3));
receive_event.reset(new PacketEvent());
@@ -369,7 +371,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, MultipleIterations) {
receive_event->packet_id = 56;
receive_event->max_packet_id = 78;
receive_event->size = 1500;
- cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass());
+ cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event));
ack_sent_event.reset(new FrameEvent());
ack_sent_event->timestamp = receiver_clock_.NowTicks();
@@ -377,7 +379,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, MultipleIterations) {
ack_sent_event->media_type = VIDEO_EVENT;
ack_sent_event->rtp_timestamp = rtp_timestamp_c;
ack_sent_event->frame_id = frame_id_c;
- cast_environment_->logger()->DispatchFrameEvent(ack_sent_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(ack_sent_event));
AdvanceClocks(base::TimeDelta::FromMilliseconds(30));
ack_event.reset(new FrameEvent());
@@ -386,7 +388,7 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, MultipleIterations) {
ack_event->media_type = VIDEO_EVENT;
ack_event->rtp_timestamp = rtp_timestamp_c;
ack_event->frame_id = frame_id_c;
- cast_environment_->logger()->DispatchFrameEvent(ack_event.Pass());
+ cast_environment_->logger()->DispatchFrameEvent(std::move(ack_event));
EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
int64_t lower_bound_ms = lower_bound.InMilliseconds();
« no previous file with comments | « media/cast/logging/log_event_dispatcher.cc ('k') | media/cast/logging/simple_event_subscriber_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698