diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 16:57:34 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 16:57:34 +0000 |
commit | ae53104f19d33cbc8dc58146d8c2f43b99a1910b (patch) | |
tree | 5d6380135fb16ba657a309e4392cb747b6ed5471 /media | |
parent | 7ff48ca7c36e03a70d42838b57d7576fd6866fd3 (diff) | |
download | chromium_src-ae53104f19d33cbc8dc58146d8c2f43b99a1910b.zip chromium_src-ae53104f19d33cbc8dc58146d8c2f43b99a1910b.tar.gz chromium_src-ae53104f19d33cbc8dc58146d8c2f43b99a1910b.tar.bz2 |
Linux/ChromeOS Chromium style checker cleanup, media/ edition.
Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.
BUG=115047
Review URL: https://chromiumcodereview.appspot.com/12211032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r-- | media/audio/audio_input_unittest.cc | 11 | ||||
-rw-r--r-- | media/audio/audio_output_proxy_unittest.cc | 4 | ||||
-rw-r--r-- | media/audio/virtual_audio_input_stream_unittest.cc | 2 | ||||
-rw-r--r-- | media/base/audio_bus_unittest.cc | 2 | ||||
-rw-r--r-- | media/base/audio_fifo_unittest.cc | 2 | ||||
-rw-r--r-- | media/base/pipeline_unittest.cc | 2 | ||||
-rw-r--r-- | media/base/run_all_unittests.cc | 2 | ||||
-rw-r--r-- | media/filters/audio_renderer_algorithm_unittest.cc | 2 |
8 files changed, 15 insertions, 12 deletions
diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc index 5a02323b..9b8787e 100644 --- a/media/audio/audio_input_unittest.cc +++ b/media/audio/audio_input_unittest.cc @@ -25,8 +25,11 @@ class TestInputCallback : public AudioInputStream::AudioInputCallback { had_error_(0), max_data_bytes_(max_data_bytes) { } - virtual void OnData(AudioInputStream* stream, const uint8* data, - uint32 size, uint32 hardware_delay_bytes, double volume) { + virtual void OnData(AudioInputStream* stream, + const uint8* data, + uint32 size, + uint32 hardware_delay_bytes, + double volume) OVERRIDE { ++callback_count_; // Read the first byte to make sure memory is good. if (size) { @@ -35,8 +38,8 @@ class TestInputCallback : public AudioInputStream::AudioInputCallback { EXPECT_GE(value, 0); } } - virtual void OnClose(AudioInputStream* stream) {} - virtual void OnError(AudioInputStream* stream, int code) { + virtual void OnClose(AudioInputStream* stream) OVERRIDE {} + virtual void OnError(AudioInputStream* stream, int code) OVERRIDE { ++had_error_; } // Returns how many times OnData() has been called. diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc index fdebdab..fc0cd26 100644 --- a/media/audio/audio_output_proxy_unittest.cc +++ b/media/audio/audio_output_proxy_unittest.cc @@ -453,7 +453,7 @@ class AudioOutputResamplerTest : public AudioOutputProxyTest { AudioOutputProxyTest::TearDown(); } - virtual void InitDispatcher(base::TimeDelta close_delay) { + virtual void InitDispatcher(base::TimeDelta close_delay) OVERRIDE { AudioOutputProxyTest::InitDispatcher(close_delay); // Use a low sample rate and large buffer size when testing otherwise the // FakeAudioOutputStream will keep the message loop busy indefinitely; i.e., @@ -465,7 +465,7 @@ class AudioOutputResamplerTest : public AudioOutputProxyTest { &manager(), params_, resampler_params_, close_delay); } - virtual void OnStart() { + virtual void OnStart() OVERRIDE { // Let start run for a bit. message_loop_.RunUntilIdle(); base::PlatformThread::Sleep( diff --git a/media/audio/virtual_audio_input_stream_unittest.cc b/media/audio/virtual_audio_input_stream_unittest.cc index 5a5be13..978563b 100644 --- a/media/audio/virtual_audio_input_stream_unittest.cc +++ b/media/audio/virtual_audio_input_stream_unittest.cc @@ -109,7 +109,7 @@ class VirtualAudioInputStreamTest this)); } - ~VirtualAudioInputStreamTest() { + virtual ~VirtualAudioInputStreamTest() { audio_manager_->GetMessageLoop()->PostTask( FROM_HERE, base::Bind(&AudioManager::RemoveOutputDeviceChangeListener, diff --git a/media/base/audio_bus_unittest.cc b/media/base/audio_bus_unittest.cc index 8fad49d..affce35 100644 --- a/media/base/audio_bus_unittest.cc +++ b/media/base/audio_bus_unittest.cc @@ -22,7 +22,7 @@ static const int kSampleRate = 48000; class AudioBusTest : public testing::Test { public: AudioBusTest() {} - ~AudioBusTest() { + virtual ~AudioBusTest() { for (size_t i = 0; i < data_.size(); ++i) base::AlignedFree(data_[i]); } diff --git a/media/base/audio_fifo_unittest.cc b/media/base/audio_fifo_unittest.cc index dd5ffd9..70ad969 100644 --- a/media/base/audio_fifo_unittest.cc +++ b/media/base/audio_fifo_unittest.cc @@ -12,7 +12,7 @@ namespace media { class AudioFifoTest : public testing::Test { public: AudioFifoTest() {} - ~AudioFifoTest() {} + virtual ~AudioFifoTest() {} void VerifyValue(const float data[], int size, float value) { for (int i = 0; i < size; ++i) diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc index b6fc445..fe3219d 100644 --- a/media/base/pipeline_unittest.cc +++ b/media/base/pipeline_unittest.cc @@ -862,7 +862,7 @@ class FlexibleCallbackRunner : public base::DelegateSimpleThread::Delegate { return; } } - virtual void Run() { + virtual void Run() OVERRIDE { if (delay_ < base::TimeDelta()) return; base::PlatformThread::Sleep(delay_); status_cb_.Run(status_); diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc index 06c15d4..b66b04b 100644 --- a/media/base/run_all_unittests.cc +++ b/media/base/run_all_unittests.cc @@ -11,7 +11,7 @@ class TestSuiteNoAtExit : public base::TestSuite { TestSuiteNoAtExit(int argc, char** argv) : TestSuite(argc, argv) {} virtual ~TestSuiteNoAtExit() {} protected: - virtual void Initialize(); + virtual void Initialize() OVERRIDE; }; void TestSuiteNoAtExit::Initialize() { diff --git a/media/filters/audio_renderer_algorithm_unittest.cc b/media/filters/audio_renderer_algorithm_unittest.cc index 33e2fd0..7a08b66 100644 --- a/media/filters/audio_renderer_algorithm_unittest.cc +++ b/media/filters/audio_renderer_algorithm_unittest.cc @@ -30,7 +30,7 @@ class AudioRendererAlgorithmTest : public testing::Test { : bytes_enqueued_(0) { } - ~AudioRendererAlgorithmTest() {} + virtual ~AudioRendererAlgorithmTest() {} void Initialize() { Initialize(kDefaultChannelLayout, kDefaultSampleBits, kSamplesPerSecond); |