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

Unified Diff: content/renderer/media/webrtc_local_audio_track_unittest.cc

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/webrtc_local_audio_track.h ('k') | content/renderer/memory_benchmarking_extension.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webrtc_local_audio_track_unittest.cc
diff --git a/content/renderer/media/webrtc_local_audio_track_unittest.cc b/content/renderer/media/webrtc_local_audio_track_unittest.cc
index d3d074bcd6a6d6bfaed602469e800a3995402561..79eecf00a8e8f9d56a448048a3acfb6ca1588abd 100644
--- a/content/renderer/media/webrtc_local_audio_track_unittest.cc
+++ b/content/renderer/media/webrtc_local_audio_track_unittest.cc
@@ -48,7 +48,7 @@ class FakeAudioThread : public base::PlatformThread::Delegate {
virtual ~FakeAudioThread() { DCHECK(thread_.is_null()); }
// base::PlatformThread::Delegate:
- virtual void ThreadMain() OVERRIDE {
+ virtual void ThreadMain() override {
while (true) {
if (closure_.IsSignaled())
return;
@@ -98,17 +98,17 @@ class MockCapturerSource : public media::AudioCapturerSource {
virtual void Initialize(const media::AudioParameters& params,
CaptureCallback* callback,
- int session_id) OVERRIDE {
+ int session_id) override {
DCHECK(params.IsValid());
params_ = params;
OnInitialize(params, callback, session_id);
}
- virtual void Start() OVERRIDE {
+ virtual void Start() override {
audio_thread_.reset(new FakeAudioThread(capturer_, params_));
audio_thread_->Start();
OnStart();
}
- virtual void Stop() OVERRIDE {
+ virtual void Stop() override {
audio_thread_->Stop();
audio_thread_.reset();
OnStop();
@@ -135,7 +135,7 @@ class MockMediaStreamAudioSink : public PeerConnectionAudioSink {
int audio_delay_milliseconds,
int current_volume,
bool need_audio_processing,
- bool key_pressed) OVERRIDE {
+ bool key_pressed) override {
EXPECT_EQ(params_.sample_rate(), sample_rate);
EXPECT_EQ(params_.channels(), number_of_channels);
EXPECT_EQ(params_.frames_per_buffer(), number_of_frames);
@@ -168,7 +168,7 @@ class MockMediaStreamAudioSink : public PeerConnectionAudioSink {
class WebRtcLocalAudioTrackTest : public ::testing::Test {
protected:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
params_.Reset(media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
media::CHANNEL_LAYOUT_STEREO, 2, 48000, 16, 480);
MockMediaConstraintFactory constraint_factory;
@@ -191,7 +191,7 @@ class WebRtcLocalAudioTrackTest : public ::testing::Test {
capturer_->SetCapturerSourceForTesting(capturer_source_, params_);
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
blink_source_.reset();
blink::WebHeap::collectAllGarbageForTesting();
}
« no previous file with comments | « content/renderer/media/webrtc_local_audio_track.h ('k') | content/renderer/memory_benchmarking_extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698