diff options
author | dcheng <dcheng@chromium.org> | 2015-01-08 18:11:19 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-09 02:12:05 +0000 |
commit | 03804b131250a49baeccb95b9f1b87147cff836d (patch) | |
tree | 3c1dc22aa84c04960a3e2255934a2885b181065d | |
parent | 907b256d370a3bc4ea95e2c112586f4e5ff1f973 (diff) | |
download | chromium_src-03804b131250a49baeccb95b9f1b87147cff836d.zip chromium_src-03804b131250a49baeccb95b9f1b87147cff836d.tar.gz chromium_src-03804b131250a49baeccb95b9f1b87147cff836d.tar.bz2 |
Update {virtual,override,final} for media/ to follow C++11 style.
This patch was automatically generated using a variation of
https://codereview.chromium.org/598073004 on a Mac build.
BUG=417463
Review URL: https://codereview.chromium.org/845603003
Cr-Commit-Position: refs/heads/master@{#310669}
-rw-r--r-- | media/audio/mac/audio_auhal_mac_unittest.cc | 4 | ||||
-rw-r--r-- | media/audio/mac/audio_low_latency_input_mac_unittest.cc | 4 | ||||
-rw-r--r-- | media/cast/sender/audio_encoder.cc | 2 | ||||
-rw-r--r-- | media/cast/sender/h264_vt_encoder.h | 2 | ||||
-rw-r--r-- | media/cast/sender/h264_vt_encoder_unittest.cc | 2 | ||||
-rw-r--r-- | media/video/capture/mac/video_capture_device_factory_mac_unittest.mm | 2 |
6 files changed, 5 insertions, 11 deletions
diff --git a/media/audio/mac/audio_auhal_mac_unittest.cc b/media/audio/mac/audio_auhal_mac_unittest.cc index 69179d5..4e63e5d 100644 --- a/media/audio/mac/audio_auhal_mac_unittest.cc +++ b/media/audio/mac/audio_auhal_mac_unittest.cc @@ -39,9 +39,7 @@ class AUHALStreamTest : public testing::Test { base::RunLoop().RunUntilIdle(); } - virtual ~AUHALStreamTest() { - base::RunLoop().RunUntilIdle(); - } + ~AUHALStreamTest() override { base::RunLoop().RunUntilIdle(); } AudioOutputStream* Create() { return manager_->MakeAudioOutputStream( diff --git a/media/audio/mac/audio_low_latency_input_mac_unittest.cc b/media/audio/mac/audio_low_latency_input_mac_unittest.cc index 7960b42c..03ec610 100644 --- a/media/audio/mac/audio_low_latency_input_mac_unittest.cc +++ b/media/audio/mac/audio_low_latency_input_mac_unittest.cc @@ -110,9 +110,7 @@ class MacAudioInputTest : public testing::Test { base::RunLoop().RunUntilIdle(); } - virtual ~MacAudioInputTest() { - base::RunLoop().RunUntilIdle(); - } + ~MacAudioInputTest() override { base::RunLoop().RunUntilIdle(); } // Convenience method which ensures that we are not running on the build // bots and that at least one valid input device can be found. diff --git a/media/cast/sender/audio_encoder.cc b/media/cast/sender/audio_encoder.cc index 273151f..bf41c9e 100644 --- a/media/cast/sender/audio_encoder.cc +++ b/media/cast/sender/audio_encoder.cc @@ -355,7 +355,7 @@ class AudioEncoder::AppleAacImpl : public AudioEncoder::ImplBase { } private: - virtual ~AppleAacImpl() { Teardown(); } + ~AppleAacImpl() override { Teardown(); } // Destroys the existing audio converter and file, if any. void Teardown() { diff --git a/media/cast/sender/h264_vt_encoder.h b/media/cast/sender/h264_vt_encoder.h index b54f078..1164862 100644 --- a/media/cast/sender/h264_vt_encoder.h +++ b/media/cast/sender/h264_vt_encoder.h @@ -25,7 +25,7 @@ class H264VideoToolboxEncoder : public VideoEncoder { H264VideoToolboxEncoder(scoped_refptr<CastEnvironment> cast_environment, const VideoSenderConfig& video_config, const CastInitializationCallback& initialization_cb); - virtual ~H264VideoToolboxEncoder(); + ~H264VideoToolboxEncoder() override; // media::cast::VideoEncoder implementation bool EncodeVideoFrame( diff --git a/media/cast/sender/h264_vt_encoder_unittest.cc b/media/cast/sender/h264_vt_encoder_unittest.cc index 8acd8a2..9bace5e 100644 --- a/media/cast/sender/h264_vt_encoder_unittest.cc +++ b/media/cast/sender/h264_vt_encoder_unittest.cc @@ -192,8 +192,6 @@ class H264VideoToolboxEncoderTest : public ::testing::Test { frame_->set_timestamp(base::TimeDelta()); } - virtual ~H264VideoToolboxEncoderTest() {} - void SetUp() override { clock_ = new base::SimpleTestTickClock(); clock_->Advance(base::TimeTicks::Now() - base::TimeTicks()); diff --git a/media/video/capture/mac/video_capture_device_factory_mac_unittest.mm b/media/video/capture/mac/video_capture_device_factory_mac_unittest.mm index 529a2fc..7094f3d 100644 --- a/media/video/capture/mac/video_capture_device_factory_mac_unittest.mm +++ b/media/video/capture/mac/video_capture_device_factory_mac_unittest.mm @@ -13,7 +13,7 @@ namespace media { class VideoCaptureDeviceFactoryMacTest : public testing::Test { - virtual void SetUp() { + void SetUp() override { base::CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableAVFoundation); } |