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

Side by Side Diff: media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 "base/memory/ref_counted.h" 5 #include "base/memory/ref_counted.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/test/simple_test_tick_clock.h" 7 #include "base/test/simple_test_tick_clock.h"
8 #include "base/time/tick_clock.h" 8 #include "base/time/tick_clock.h"
9 #include "media/cast/cast_environment.h" 9 #include "media/cast/cast_environment.h"
10 #include "media/cast/logging/logging_defines.h" 10 #include "media/cast/logging/logging_defines.h"
(...skipping 17 matching lines...) Expand all
28 : testing_clock_(new base::SimpleTestTickClock()), 28 : testing_clock_(new base::SimpleTestTickClock()),
29 task_runner_(new test::FakeSingleThreadTaskRunner(testing_clock_)), 29 task_runner_(new test::FakeSingleThreadTaskRunner(testing_clock_)),
30 cast_environment_(new CastEnvironment( 30 cast_environment_(new CastEnvironment(
31 scoped_ptr<base::TickClock>(testing_clock_).Pass(), 31 scoped_ptr<base::TickClock>(testing_clock_).Pass(),
32 task_runner_, 32 task_runner_,
33 task_runner_, 33 task_runner_,
34 task_runner_)) {} 34 task_runner_)) {}
35 35
36 virtual ~ReceiverRtcpEventSubscriberTest() {} 36 virtual ~ReceiverRtcpEventSubscriberTest() {}
37 37
38 virtual void TearDown() OVERRIDE { 38 virtual void TearDown() override {
39 if (event_subscriber_) { 39 if (event_subscriber_) {
40 cast_environment_->Logging()->RemoveRawEventSubscriber( 40 cast_environment_->Logging()->RemoveRawEventSubscriber(
41 event_subscriber_.get()); 41 event_subscriber_.get());
42 } 42 }
43 } 43 }
44 44
45 void Init(EventMediaType type) { 45 void Init(EventMediaType type) {
46 event_subscriber_.reset( 46 event_subscriber_.reset(
47 new ReceiverRtcpEventSubscriber(kMaxEventEntries, type)); 47 new ReceiverRtcpEventSubscriber(kMaxEventEntries, type));
48 cast_environment_->Logging()->AddRawEventSubscriber( 48 cast_environment_->Logging()->AddRawEventSubscriber(
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 /*rtp_timestamp*/ i * 10, /*frame_id*/ i); 122 /*rtp_timestamp*/ i * 10, /*frame_id*/ i);
123 } 123 }
124 124
125 ReceiverRtcpEventSubscriber::RtcpEventMultiMap rtcp_events; 125 ReceiverRtcpEventSubscriber::RtcpEventMultiMap rtcp_events;
126 event_subscriber_->GetRtcpEventsAndReset(&rtcp_events); 126 event_subscriber_->GetRtcpEventsAndReset(&rtcp_events);
127 EXPECT_EQ(10u, rtcp_events.size()); 127 EXPECT_EQ(10u, rtcp_events.size());
128 } 128 }
129 129
130 } // namespace cast 130 } // namespace cast
131 } // namespace media 131 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/net/rtcp/receiver_rtcp_event_subscriber.h ('k') | media/cast/net/rtcp/rtcp_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698