| Index: media/cast/logging/simple_event_subscriber_unittest.cc
|
| diff --git a/media/cast/logging/simple_event_subscriber_unittest.cc b/media/cast/logging/simple_event_subscriber_unittest.cc
|
| index 92b6c6e707a93429821e6221182411043282be35..f1f5f14087b6d6cfc5e36ead52abd158b59b7f25 100644
|
| --- a/media/cast/logging/simple_event_subscriber_unittest.cc
|
| +++ b/media/cast/logging/simple_event_subscriber_unittest.cc
|
| @@ -2,13 +2,16 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "media/cast/logging/simple_event_subscriber.h"
|
| +
|
| +#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/cast/cast_environment.h"
|
| #include "media/cast/logging/logging_defines.h"
|
| -#include "media/cast/logging/simple_event_subscriber.h"
|
| #include "media/cast/test/fake_single_thread_task_runner.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -20,11 +23,11 @@ class SimpleEventSubscriberTest : public ::testing::Test {
|
| SimpleEventSubscriberTest()
|
| : testing_clock_(new base::SimpleTestTickClock()),
|
| task_runner_(new test::FakeSingleThreadTaskRunner(testing_clock_)),
|
| - cast_environment_(new CastEnvironment(
|
| - scoped_ptr<base::TickClock>(testing_clock_).Pass(),
|
| - task_runner_,
|
| - task_runner_,
|
| - task_runner_)) {
|
| + cast_environment_(
|
| + new CastEnvironment(scoped_ptr<base::TickClock>(testing_clock_),
|
| + task_runner_,
|
| + task_runner_,
|
| + task_runner_)) {
|
| cast_environment_->logger()->Subscribe(&event_subscriber_);
|
| }
|
|
|
| @@ -51,7 +54,7 @@ TEST_F(SimpleEventSubscriberTest, GetAndResetEvents) {
|
| encode_event->target_bitrate = 128u;
|
| encode_event->encoder_cpu_utilization = 0.01;
|
| encode_event->idealized_bitrate_utilization = 0.02;
|
| - cast_environment_->logger()->DispatchFrameEvent(encode_event.Pass());
|
| + cast_environment_->logger()->DispatchFrameEvent(std::move(encode_event));
|
|
|
| scoped_ptr<FrameEvent> playout_event(new FrameEvent());
|
| playout_event->timestamp = testing_clock_->NowTicks();
|
| @@ -60,7 +63,7 @@ TEST_F(SimpleEventSubscriberTest, GetAndResetEvents) {
|
| playout_event->rtp_timestamp = 100u;
|
| playout_event->frame_id = 0u;
|
| playout_event->delay_delta = base::TimeDelta::FromMilliseconds(100);
|
| - cast_environment_->logger()->DispatchFrameEvent(playout_event.Pass());
|
| + cast_environment_->logger()->DispatchFrameEvent(std::move(playout_event));
|
|
|
| scoped_ptr<FrameEvent> decode_event(new FrameEvent());
|
| decode_event->timestamp = testing_clock_->NowTicks();
|
| @@ -68,7 +71,7 @@ TEST_F(SimpleEventSubscriberTest, GetAndResetEvents) {
|
| decode_event->media_type = AUDIO_EVENT;
|
| decode_event->rtp_timestamp = 200u;
|
| decode_event->frame_id = 0u;
|
| - cast_environment_->logger()->DispatchFrameEvent(decode_event.Pass());
|
| + cast_environment_->logger()->DispatchFrameEvent(std::move(decode_event));
|
|
|
| // Log some packet events.
|
| scoped_ptr<PacketEvent> receive_event(new PacketEvent());
|
| @@ -80,7 +83,7 @@ TEST_F(SimpleEventSubscriberTest, GetAndResetEvents) {
|
| receive_event->packet_id = 1u;
|
| receive_event->max_packet_id = 5u;
|
| receive_event->size = 100u;
|
| - cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass());
|
| + cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event));
|
|
|
| receive_event.reset(new PacketEvent());
|
| receive_event->timestamp = testing_clock_->NowTicks();
|
| @@ -91,7 +94,7 @@ TEST_F(SimpleEventSubscriberTest, GetAndResetEvents) {
|
| receive_event->packet_id = 1u;
|
| receive_event->max_packet_id = 10u;
|
| receive_event->size = 1024u;
|
| - cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass());
|
| + cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event));
|
|
|
| std::vector<FrameEvent> frame_events;
|
| event_subscriber_.GetFrameEventsAndReset(&frame_events);
|
|
|