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

Side by Side Diff: media/cast/logging/simple_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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/cast/logging/simple_event_subscriber.h" 5 #include "media/cast/logging/simple_event_subscriber.h"
6 6
7 #include <memory>
7 #include <utility> 8 #include <utility>
8 9
9 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "base/test/simple_test_tick_clock.h" 11 #include "base/test/simple_test_tick_clock.h"
12 #include "base/time/tick_clock.h" 12 #include "base/time/tick_clock.h"
13 #include "media/base/fake_single_thread_task_runner.h" 13 #include "media/base/fake_single_thread_task_runner.h"
14 #include "media/cast/cast_environment.h" 14 #include "media/cast/cast_environment.h"
15 #include "media/cast/logging/logging_defines.h" 15 #include "media/cast/logging/logging_defines.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 17
18 namespace media { 18 namespace media {
19 namespace cast { 19 namespace cast {
20 20
21 class SimpleEventSubscriberTest : public ::testing::Test { 21 class SimpleEventSubscriberTest : public ::testing::Test {
22 protected: 22 protected:
23 SimpleEventSubscriberTest() 23 SimpleEventSubscriberTest()
24 : testing_clock_(new base::SimpleTestTickClock()), 24 : testing_clock_(new base::SimpleTestTickClock()),
25 task_runner_(new FakeSingleThreadTaskRunner(testing_clock_)), 25 task_runner_(new FakeSingleThreadTaskRunner(testing_clock_)),
26 cast_environment_( 26 cast_environment_(new CastEnvironment(
27 new CastEnvironment(scoped_ptr<base::TickClock>(testing_clock_), 27 std::unique_ptr<base::TickClock>(testing_clock_),
28 task_runner_, 28 task_runner_,
29 task_runner_, 29 task_runner_,
30 task_runner_)) { 30 task_runner_)) {
31 cast_environment_->logger()->Subscribe(&event_subscriber_); 31 cast_environment_->logger()->Subscribe(&event_subscriber_);
32 } 32 }
33 33
34 ~SimpleEventSubscriberTest() override { 34 ~SimpleEventSubscriberTest() override {
35 cast_environment_->logger()->Unsubscribe(&event_subscriber_); 35 cast_environment_->logger()->Unsubscribe(&event_subscriber_);
36 } 36 }
37 37
38 base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment. 38 base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment.
39 scoped_refptr<FakeSingleThreadTaskRunner> task_runner_; 39 scoped_refptr<FakeSingleThreadTaskRunner> task_runner_;
40 scoped_refptr<CastEnvironment> cast_environment_; 40 scoped_refptr<CastEnvironment> cast_environment_;
41 SimpleEventSubscriber event_subscriber_; 41 SimpleEventSubscriber event_subscriber_;
42 }; 42 };
43 43
44 TEST_F(SimpleEventSubscriberTest, GetAndResetEvents) { 44 TEST_F(SimpleEventSubscriberTest, GetAndResetEvents) {
45 // Log some frame events. 45 // Log some frame events.
46 scoped_ptr<FrameEvent> encode_event(new FrameEvent()); 46 std::unique_ptr<FrameEvent> encode_event(new FrameEvent());
47 encode_event->timestamp = testing_clock_->NowTicks(); 47 encode_event->timestamp = testing_clock_->NowTicks();
48 encode_event->type = FRAME_ENCODED; 48 encode_event->type = FRAME_ENCODED;
49 encode_event->media_type = AUDIO_EVENT; 49 encode_event->media_type = AUDIO_EVENT;
50 encode_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100)); 50 encode_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
51 encode_event->frame_id = 0u; 51 encode_event->frame_id = 0u;
52 encode_event->size = 1234; 52 encode_event->size = 1234;
53 encode_event->key_frame = true; 53 encode_event->key_frame = true;
54 encode_event->target_bitrate = 128u; 54 encode_event->target_bitrate = 128u;
55 encode_event->encoder_cpu_utilization = 0.01; 55 encode_event->encoder_cpu_utilization = 0.01;
56 encode_event->idealized_bitrate_utilization = 0.02; 56 encode_event->idealized_bitrate_utilization = 0.02;
57 cast_environment_->logger()->DispatchFrameEvent(std::move(encode_event)); 57 cast_environment_->logger()->DispatchFrameEvent(std::move(encode_event));
58 58
59 scoped_ptr<FrameEvent> playout_event(new FrameEvent()); 59 std::unique_ptr<FrameEvent> playout_event(new FrameEvent());
60 playout_event->timestamp = testing_clock_->NowTicks(); 60 playout_event->timestamp = testing_clock_->NowTicks();
61 playout_event->type = FRAME_PLAYOUT; 61 playout_event->type = FRAME_PLAYOUT;
62 playout_event->media_type = AUDIO_EVENT; 62 playout_event->media_type = AUDIO_EVENT;
63 playout_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100)); 63 playout_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
64 playout_event->frame_id = 0u; 64 playout_event->frame_id = 0u;
65 playout_event->delay_delta = base::TimeDelta::FromMilliseconds(100); 65 playout_event->delay_delta = base::TimeDelta::FromMilliseconds(100);
66 cast_environment_->logger()->DispatchFrameEvent(std::move(playout_event)); 66 cast_environment_->logger()->DispatchFrameEvent(std::move(playout_event));
67 67
68 scoped_ptr<FrameEvent> decode_event(new FrameEvent()); 68 std::unique_ptr<FrameEvent> decode_event(new FrameEvent());
69 decode_event->timestamp = testing_clock_->NowTicks(); 69 decode_event->timestamp = testing_clock_->NowTicks();
70 decode_event->type = FRAME_DECODED; 70 decode_event->type = FRAME_DECODED;
71 decode_event->media_type = AUDIO_EVENT; 71 decode_event->media_type = AUDIO_EVENT;
72 decode_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(200)); 72 decode_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(200));
73 decode_event->frame_id = 0u; 73 decode_event->frame_id = 0u;
74 cast_environment_->logger()->DispatchFrameEvent(std::move(decode_event)); 74 cast_environment_->logger()->DispatchFrameEvent(std::move(decode_event));
75 75
76 // Log some packet events. 76 // Log some packet events.
77 scoped_ptr<PacketEvent> receive_event(new PacketEvent()); 77 std::unique_ptr<PacketEvent> receive_event(new PacketEvent());
78 receive_event->timestamp = testing_clock_->NowTicks(); 78 receive_event->timestamp = testing_clock_->NowTicks();
79 receive_event->type = PACKET_RECEIVED; 79 receive_event->type = PACKET_RECEIVED;
80 receive_event->media_type = AUDIO_EVENT; 80 receive_event->media_type = AUDIO_EVENT;
81 receive_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(200)); 81 receive_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(200));
82 receive_event->frame_id = 0u; 82 receive_event->frame_id = 0u;
83 receive_event->packet_id = 1u; 83 receive_event->packet_id = 1u;
84 receive_event->max_packet_id = 5u; 84 receive_event->max_packet_id = 5u;
85 receive_event->size = 100u; 85 receive_event->size = 100u;
86 cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event)); 86 cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event));
87 87
(...skipping 19 matching lines...) Expand all
107 // Calling this function again should result in empty vector because no events 107 // Calling this function again should result in empty vector because no events
108 // were logged since last call. 108 // were logged since last call.
109 event_subscriber_.GetFrameEventsAndReset(&frame_events); 109 event_subscriber_.GetFrameEventsAndReset(&frame_events);
110 event_subscriber_.GetPacketEventsAndReset(&packet_events); 110 event_subscriber_.GetPacketEventsAndReset(&packet_events);
111 EXPECT_TRUE(frame_events.empty()); 111 EXPECT_TRUE(frame_events.empty());
112 EXPECT_TRUE(packet_events.empty()); 112 EXPECT_TRUE(packet_events.empty());
113 } 113 }
114 114
115 } // namespace cast 115 } // namespace cast
116 } // namespace media 116 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/logging/serialize_deserialize_test.cc ('k') | media/cast/logging/stats_event_subscriber.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698