From 2dcbdb93081c00d3f0859edf7213a4490f3e671e Mon Sep 17 00:00:00 2001 From: dcheng Date: Mon, 27 Oct 2014 15:18:50 -0700 Subject: Standardize usage of virtual/override/final specifiers. The Google C++ style guide states: Explicitly annotate overrides of virtual functions or virtual destructors with an override or (less frequently) final specifier. Older (pre-C++11) code will use the virtual keyword as an inferior alternative annotation. For clarity, use exactly one of override, final, or virtual when declaring an override. To better conform to these guidelines, the following constructs have been rewritten: - if a base class has a virtual destructor, then: virtual ~Foo(); -> ~Foo() override; - virtual void Foo() override; -> void Foo() override; - virtual void Foo() override final; -> void Foo() final; This patch was automatically generated. The clang plugin can generate fixit hints, which are suggested edits when it is 100% sure it knows how to fix a problem. The hints from the clang plugin were applied to the source tree using the tool in https://codereview.chromium.org/598073004. BUG=417463 R=wolenetz@chromium.org Review URL: https://codereview.chromium.org/661163004 Cr-Commit-Position: refs/heads/master@{#301462} --- media/cast/receiver/audio_decoder_unittest.cc | 2 +- media/cast/receiver/frame_receiver_unittest.cc | 4 ++-- media/cast/receiver/video_decoder_unittest.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'media/cast/receiver') diff --git a/media/cast/receiver/audio_decoder_unittest.cc b/media/cast/receiver/audio_decoder_unittest.cc index 7f46715..ac13af1 100644 --- a/media/cast/receiver/audio_decoder_unittest.cc +++ b/media/cast/receiver/audio_decoder_unittest.cc @@ -41,7 +41,7 @@ class AudioDecoderTest : public ::testing::TestWithParam { } protected: - virtual void SetUp() override { + void SetUp() override { audio_decoder_.reset(new AudioDecoder(cast_environment_, GetParam().num_channels, GetParam().sampling_rate, diff --git a/media/cast/receiver/frame_receiver_unittest.cc b/media/cast/receiver/frame_receiver_unittest.cc index abdfb9d..24e1a0b 100644 --- a/media/cast/receiver/frame_receiver_unittest.cc +++ b/media/cast/receiver/frame_receiver_unittest.cc @@ -77,9 +77,9 @@ class FrameReceiverTest : public ::testing::Test { task_runner_); } - virtual ~FrameReceiverTest() {} + ~FrameReceiverTest() override {} - virtual void SetUp() { + void SetUp() override { payload_.assign(kPacketSize, 0); // Always start with a key frame. diff --git a/media/cast/receiver/video_decoder_unittest.cc b/media/cast/receiver/video_decoder_unittest.cc index 2184707..f777cb3 100644 --- a/media/cast/receiver/video_decoder_unittest.cc +++ b/media/cast/receiver/video_decoder_unittest.cc @@ -51,7 +51,7 @@ class VideoDecoderTest : public ::testing::TestWithParam { } protected: - virtual void SetUp() override { + void SetUp() override { video_decoder_.reset(new VideoDecoder(cast_environment_, GetParam())); CHECK_EQ(STATUS_VIDEO_INITIALIZED, video_decoder_->InitializationResult()); -- cgit v1.1