Add OVERRIDE to media/.

BUG=104314
TEST=no change

Review URL: http://codereview.chromium.org/8520033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110304 0039d316-1c4b-4281-b951-d872f2087c98

34 files changed, 148 insertions, 139 deletions

diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h
index fdc29cf..909f3dd 100644
--- a/media/audio/audio_input_controller.h
+++ b/media/audio/audio_input_controller.h
@@ -118,9 +118,9 @@ class MEDIA_EXPORT AudioInputController
   ///////////////////////////////////////////////////////////////////////////
   // AudioInputCallback methods.
   virtual void OnData(AudioInputStream* stream, const uint8* src, uint32 size,
-                      uint32 hardware_delay_bytes);
-  virtual void OnClose(AudioInputStream* stream);
-  virtual void OnError(AudioInputStream* stream, int code);
+                      uint32 hardware_delay_bytes) OVERRIDE;
+  virtual void OnClose(AudioInputStream* stream) OVERRIDE;
+  virtual void OnError(AudioInputStream* stream, int code) OVERRIDE;
 
  protected:
   // Internal state of the source.
diff --git a/media/audio/audio_output_proxy.h b/media/audio/audio_output_proxy.h
index c9f7d6f..f9a2554 100644
--- a/media/audio/audio_output_proxy.h
+++ b/media/audio/audio_output_proxy.h
@@ -26,12 +26,12 @@ class MEDIA_EXPORT AudioOutputProxy : public AudioOutputStream {
   AudioOutputProxy(AudioOutputDispatcher* dispatcher);
 
   // AudioOutputStream interface.
-  virtual bool Open();
-  virtual void Start(AudioSourceCallback* callback);
-  virtual void Stop();
-  virtual void SetVolume(double volume);
-  virtual void GetVolume(double* volume);
-  virtual void Close();
+  virtual bool Open() OVERRIDE;
+  virtual void Start(AudioSourceCallback* callback) OVERRIDE;
+  virtual void Stop() OVERRIDE;
+  virtual void SetVolume(double volume) OVERRIDE;
+  virtual void GetVolume(double* volume) OVERRIDE;
+  virtual void Close() OVERRIDE;
 
  private:
   // Needs to access destructor.
diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h
index 6c0eb73..a89aada 100644
--- a/media/audio/fake_audio_input_stream.h
+++ b/media/audio/fake_audio_input_stream.h
@@ -22,10 +22,10 @@ class FakeAudioInputStream
  public:
   static AudioInputStream* MakeFakeStream(const AudioParameters& params);
 
-  virtual bool Open();
-  virtual void Start(AudioInputCallback* callback);
-  virtual void Stop();
-  virtual void Close();
+  virtual bool Open() OVERRIDE;
+  virtual void Start(AudioInputCallback* callback) OVERRIDE;
+  virtual void Stop() OVERRIDE;
+  virtual void Close() OVERRIDE;
 
  private:
   // Give RefCountedThreadSafe access our destructor.
diff --git a/media/audio/fake_audio_output_stream.h b/media/audio/fake_audio_output_stream.h
index ac53db5..3ea0f8b 100644
--- a/media/audio/fake_audio_output_stream.h
+++ b/media/audio/fake_audio_output_stream.h
@@ -20,12 +20,12 @@ class MEDIA_EXPORT FakeAudioOutputStream : public AudioOutputStream {
   static AudioOutputStream* MakeFakeStream(const AudioParameters& params);
   static FakeAudioOutputStream* GetLastFakeStream();
 
-  virtual bool Open();
-  virtual void Start(AudioSourceCallback* callback);
-  virtual void Stop();
-  virtual void SetVolume(double volume);
-  virtual void GetVolume(double* volume);
-  virtual void Close();
+  virtual bool Open() OVERRIDE;
+  virtual void Start(AudioSourceCallback* callback) OVERRIDE;
+  virtual void Stop() OVERRIDE;
+  virtual void SetVolume(double volume) OVERRIDE;
+  virtual void GetVolume(double* volume) OVERRIDE;
+  virtual void Close() OVERRIDE;
 
   uint8* buffer() { return buffer_.get(); }
   double volume() { return volume_; }
diff --git a/media/audio/mac/audio_low_latency_output_mac.h b/media/audio/mac/audio_low_latency_output_mac.h
index cab4832..f6e8649 100644
--- a/media/audio/mac/audio_low_latency_output_mac.h
+++ b/media/audio/mac/audio_low_latency_output_mac.h
@@ -39,12 +39,12 @@ class AUAudioOutputStream : public AudioOutputStream {
   virtual ~AUAudioOutputStream();
 
   // Implementation of AudioOutputStream.
-  virtual bool Open();
-  virtual void Close();
-  virtual void Start(AudioSourceCallback* callback);
-  virtual void Stop();
-  virtual void SetVolume(double volume);
-  virtual void GetVolume(double* volume);
+  virtual bool Open() OVERRIDE;
+  virtual void Close() OVERRIDE;
+  virtual void Start(AudioSourceCallback* callback) OVERRIDE;
+  virtual void Stop() OVERRIDE;
+  virtual void SetVolume(double volume) OVERRIDE;
+  virtual void GetVolume(double* volume) OVERRIDE;
 
   static double HardwareSampleRate();
 
diff --git a/media/audio/mac/audio_output_mac.h b/media/audio/mac/audio_output_mac.h
index 8d18c3e..e033fc9 100644
--- a/media/audio/mac/audio_output_mac.h
+++ b/media/audio/mac/audio_output_mac.h
@@ -9,6 +9,7 @@
 #include <AudioToolbox/AudioQueue.h>
 #include <AudioUnit/AudioUnit.h>
 
+#include "base/compiler_specific.h"
 #include "base/synchronization/lock.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
@@ -29,12 +30,12 @@ class PCMQueueOutAudioOutputStream : public AudioOutputStream {
   virtual ~PCMQueueOutAudioOutputStream();
 
   // Implementation of AudioOutputStream.
-  virtual bool Open();
-  virtual void Close();
-  virtual void Start(AudioSourceCallback* callback);
-  virtual void Stop();
-  virtual void SetVolume(double volume);
-  virtual void GetVolume(double* volume);
+  virtual bool Open() OVERRIDE;
+  virtual void Close() OVERRIDE;
+  virtual void Start(AudioSourceCallback* callback) OVERRIDE;
+  virtual void Stop() OVERRIDE;
+  virtual void SetVolume(double volume) OVERRIDE;
+  virtual void GetVolume(double* volume) OVERRIDE;
 
  private:
   // The audio is double buffered.
diff --git a/media/audio/simple_sources.h b/media/audio/simple_sources.h
index de70601..dd2782c 100644
--- a/media/audio/simple_sources.h
+++ b/media/audio/simple_sources.h
@@ -28,8 +28,8 @@ class MEDIA_EXPORT SineWaveAudioSource
   // Implementation of AudioSourceCallback.
   virtual uint32 OnMoreData(
       AudioOutputStream* stream, uint8* dest, uint32 max_size,
-      AudioBuffersState audio_buffers);
-  virtual void OnError(AudioOutputStream* stream, int code);
+      AudioBuffersState audio_buffers) OVERRIDE;
+  virtual void OnError(AudioOutputStream* stream, int code) OVERRIDE;
 
  protected:
   Format format_;
@@ -65,15 +65,17 @@ class MEDIA_EXPORT PushSource
   virtual ~PushSource();
 
   // Write one buffer.
-  virtual bool Write(const void* data, uint32 len);
+  virtual bool Write(const void* data, uint32 len) OVERRIDE;
 
   // Return the total number of bytes not given to the audio device yet.
-  virtual uint32 UnProcessedBytes();
+  virtual uint32 UnProcessedBytes() OVERRIDE;
 
   // Implementation of AudioSourceCallback.
-  virtual uint32 OnMoreData(AudioOutputStream* stream, uint8* dest,
-                            uint32 max_size, AudioBuffersState buffers_state);
-  virtual void OnError(AudioOutputStream* stream, int code);
+  virtual uint32 OnMoreData(AudioOutputStream* stream,
+                            uint8* dest,
+                            uint32 max_size,
+                            AudioBuffersState buffers_state) OVERRIDE;
+  virtual void OnError(AudioOutputStream* stream, int code) OVERRIDE;
 
   // Discard all buffered data and reset to initial state.
   void ClearAll();
diff --git a/media/audio/test_audio_input_controller_factory.h b/media/audio/test_audio_input_controller_factory.h
index 97b7201..7b178c4 100644
--- a/media/audio/test_audio_input_controller_factory.h
+++ b/media/audio/test_audio_input_controller_factory.h
@@ -54,8 +54,8 @@ class TestAudioInputController : public AudioInputController {
 
   // Overriden to do nothing. It is assumed the caller will notify the event
   // handler with recorded data and other events.
-  virtual void Record() {}
-  virtual void Close() {}
+  virtual void Record() OVERRIDE {}
+  virtual void Close() OVERRIDE {}
 
  private:
   // These are not owned by us and expected to be valid for this object's
@@ -75,7 +75,7 @@ class TestAudioInputControllerFactory : public AudioInputController::Factory {
   // AudioInputController::Factory methods.
   virtual AudioInputController* Create(
       AudioInputController::EventHandler* event_handler,
-      AudioParameters params);
+      AudioParameters params) OVERRIDE;
 
   TestAudioInputController* controller() const { return controller_; }
 
diff --git a/media/base/async_filter_factory_base.h b/media/base/async_filter_factory_base.h
index 0f512d1..303bad9 100644
--- a/media/base/async_filter_factory_base.h
+++ b/media/base/async_filter_factory_base.h
@@ -54,7 +54,8 @@ class MEDIA_EXPORT AsyncDataSourceFactoryBase : public DataSourceFactory {
   // DataSourceFactory method.
   // Derived classes should not overload this Build() method. AllowRequests() &
   // CreateRequest() should be implemented instead.
-  virtual void Build(const std::string& url, const BuildCallback& callback);
+  virtual void Build(const std::string& url,
+                     const BuildCallback& callback) OVERRIDE;
 
   // DataSourceFactory method.
   // Clone() must be implemented by derived classes.
diff --git a/media/base/buffers.h b/media/base/buffers.h
index a97d8dd..82f2402 100644
--- a/media/base/buffers.h
+++ b/media/base/buffers.h
@@ -87,7 +87,7 @@ class MEDIA_EXPORT Buffer : public StreamSample {
   virtual size_t GetDataSize() const = 0;
 
   // If there's no data in this buffer, it represents end of stream.
-  virtual bool IsEndOfStream() const;
+  virtual bool IsEndOfStream() const OVERRIDE;
 
  protected:
   virtual ~Buffer() {}
diff --git a/media/base/composite_data_source_factory.h b/media/base/composite_data_source_factory.h
index c714bbe..9f962d8 100644
--- a/media/base/composite_data_source_factory.h
+++ b/media/base/composite_data_source_factory.h
@@ -23,13 +23,13 @@ class MEDIA_EXPORT CompositeDataSourceFactory
   void AddFactory(DataSourceFactory* factory);
 
   // DataSourceFactory method.
-  virtual DataSourceFactory* Clone() const;
+  virtual DataSourceFactory* Clone() const OVERRIDE;
 
  protected:
   // AsyncDataSourceFactoryBase methods.
-  virtual bool AllowRequests() const;
+  virtual bool AllowRequests() const OVERRIDE;
   virtual AsyncDataSourceFactoryBase::BuildRequest* CreateRequest(
-      const std::string& url, const BuildCallback& callback);
+      const std::string& url, const BuildCallback& callback) OVERRIDE;
 
  private:
   class BuildRequest;
diff --git a/media/base/data_buffer.h b/media/base/data_buffer.h
index de1eb35..bb010f3 100644
--- a/media/base/data_buffer.h
+++ b/media/base/data_buffer.h
@@ -26,8 +26,8 @@ class MEDIA_EXPORT DataBuffer : public Buffer {
   explicit DataBuffer(size_t buffer_size);
 
   // Buffer implementation.
-  virtual const uint8* GetData() const;
-  virtual size_t GetDataSize() const;
+  virtual const uint8* GetData() const OVERRIDE;
+  virtual size_t GetDataSize() const OVERRIDE;
 
   // Returns a read-write pointer to the buffer data.
   virtual uint8* GetWritableData();
diff --git a/media/base/message_loop_factory_impl.h b/media/base/message_loop_factory_impl.h
index f5b5c06..e0e0710 100644
--- a/media/base/message_loop_factory_impl.h
+++ b/media/base/message_loop_factory_impl.h
@@ -18,9 +18,9 @@ class MEDIA_EXPORT MessageLoopFactoryImpl : public MessageLoopFactory {
   MessageLoopFactoryImpl();
 
   // MessageLoopFactory methods.
-  virtual MessageLoop* GetMessageLoop(const std::string& name);
+  virtual MessageLoop* GetMessageLoop(const std::string& name) OVERRIDE;
   virtual scoped_refptr<base::MessageLoopProxy> GetMessageLoopProxy(
-      const std::string& name);
+      const std::string& name) OVERRIDE;
 
  protected:
   virtual ~MessageLoopFactoryImpl();
diff --git a/media/base/video_frame.h b/media/base/video_frame.h
index 50ea32b..ab96544 100644
--- a/media/base/video_frame.h
+++ b/media/base/video_frame.h
@@ -79,7 +79,7 @@ class MEDIA_EXPORT VideoFrame : public StreamSample {
   uint8* data(size_t plane) const;
 
   // StreamSample interface.
-  virtual bool IsEndOfStream() const;
+  virtual bool IsEndOfStream() const OVERRIDE;
 
  protected:
   // Clients must use the static CreateFrame() method to create a new frame.
diff --git a/media/filters/audio_renderer_algorithm_default.h b/media/filters/audio_renderer_algorithm_default.h
index 510df8b..7950542 100644
--- a/media/filters/audio_renderer_algorithm_default.h
+++ b/media/filters/audio_renderer_algorithm_default.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -20,7 +20,7 @@ class AudioRendererAlgorithmDefault : public AudioRendererAlgorithmBase {
   virtual ~AudioRendererAlgorithmDefault();
 
   // AudioRendererAlgorithmBase implementation
-  virtual uint32 FillBuffer(uint8* dest, uint32 length);
+  virtual uint32 FillBuffer(uint8* dest, uint32 length) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AudioRendererAlgorithmDefault);
diff --git a/media/filters/audio_renderer_algorithm_ola.h b/media/filters/audio_renderer_algorithm_ola.h
index 88fd305..8cefcbf 100644
--- a/media/filters/audio_renderer_algorithm_ola.h
+++ b/media/filters/audio_renderer_algorithm_ola.h
@@ -26,9 +26,9 @@ class MEDIA_EXPORT AudioRendererAlgorithmOLA
   virtual ~AudioRendererAlgorithmOLA();
 
   // AudioRendererAlgorithmBase implementation
-  virtual uint32 FillBuffer(uint8* dest, uint32 length);
+  virtual uint32 FillBuffer(uint8* dest, uint32 length) OVERRIDE;
 
-  virtual void set_playback_rate(float new_rate);
+  virtual void set_playback_rate(float new_rate) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(AudioRendererAlgorithmOLATest,
diff --git a/media/filters/audio_renderer_base.h b/media/filters/audio_renderer_base.h
index e4d19cf..26aa76b 100644
--- a/media/filters/audio_renderer_base.h
+++ b/media/filters/audio_renderer_base.h
@@ -88,7 +88,7 @@ class MEDIA_EXPORT AudioRendererBase : public AudioRenderer {
                     bool buffers_empty);
 
   // Get/Set the playback rate of |algorithm_|.
-  virtual void SetPlaybackRate(float playback_rate);
+  virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
   virtual float GetPlaybackRate();
 
  private:
diff --git a/media/filters/bitstream_converter.h b/media/filters/bitstream_converter.h
index fbc8ca6..c08143e 100644
--- a/media/filters/bitstream_converter.h
+++ b/media/filters/bitstream_converter.h
@@ -13,6 +13,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "media/base/media_export.h"
 
@@ -47,8 +48,8 @@ class IdentityBitstreamConverter : public BitstreamConverter {
   IdentityBitstreamConverter() {}
   virtual ~IdentityBitstreamConverter() {}
 
-  virtual bool Initialize();
-  virtual bool ConvertPacket(AVPacket* packet);
+  virtual bool Initialize() OVERRIDE;
+  virtual bool ConvertPacket(AVPacket* packet) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(IdentityBitstreamConverter);
@@ -66,8 +67,8 @@ class MEDIA_EXPORT FFmpegBitstreamConverter : public BitstreamConverter {
                            AVCodecContext* stream_context);
   virtual ~FFmpegBitstreamConverter();
 
-  virtual bool Initialize();
-  virtual bool ConvertPacket(AVPacket* packet);
+  virtual bool Initialize() OVERRIDE;
+  virtual bool ConvertPacket(AVPacket* packet) OVERRIDE;
 
  private:
   std::string filter_name_;
diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
index 8f09761..63dd7b1 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -34,7 +34,8 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
   virtual void Stop(const base::Closure& callback) OVERRIDE;
   virtual void Seek(base::TimeDelta time, const PipelineStatusCB&  cb) OVERRIDE;
   virtual void OnAudioRendererDisabled() OVERRIDE;
-  virtual scoped_refptr<DemuxerStream> GetStream(DemuxerStream::Type type);
+  virtual scoped_refptr<DemuxerStream> GetStream(
+      DemuxerStream::Type type) OVERRIDE;
   virtual void SetPreload(Preload preload) OVERRIDE;
   virtual base::TimeDelta GetStartTime() const OVERRIDE;
 
diff --git a/media/filters/chunk_demuxer_factory.h b/media/filters/chunk_demuxer_factory.h
index beab479..2cad897 100644
--- a/media/filters/chunk_demuxer_factory.h
+++ b/media/filters/chunk_demuxer_factory.h
@@ -28,8 +28,8 @@ class MEDIA_EXPORT ChunkDemuxerFactory : public DemuxerFactory {
   virtual ~ChunkDemuxerFactory();
 
   // DemuxerFactory methods.
-  virtual void Build(const std::string& url, const BuildCallback& cb);
-  virtual DemuxerFactory* Clone() const;
+  virtual void Build(const std::string& url, const BuildCallback& cb) OVERRIDE;
+  virtual DemuxerFactory* Clone() const OVERRIDE;
 
  private:
   std::string url_;
diff --git a/media/filters/ffmpeg_h264_bitstream_converter.h b/media/filters/ffmpeg_h264_bitstream_converter.h
index e27cc60..151830f 100644
--- a/media/filters/ffmpeg_h264_bitstream_converter.h
+++ b/media/filters/ffmpeg_h264_bitstream_converter.h
@@ -44,8 +44,8 @@ class MEDIA_EXPORT FFmpegH264BitstreamConverter : public BitstreamConverter {
   virtual ~FFmpegH264BitstreamConverter();
 
   // BitstreamConverter implementation
-  virtual bool Initialize();
-  virtual bool ConvertPacket(AVPacket* packet);
+  virtual bool Initialize() OVERRIDE;
+  virtual bool ConvertPacket(AVPacket* packet) OVERRIDE;
 
  private:
   // Actual converter class.
diff --git a/media/filters/file_data_source.h b/media/filters/file_data_source.h
index fb905d2..0a26855 100644
--- a/media/filters/file_data_source.h
+++ b/media/filters/file_data_source.h
@@ -24,16 +24,16 @@ class MEDIA_EXPORT FileDataSource : public DataSource {
   PipelineStatus Initialize(const std::string& url);
 
   // Implementation of Filter.
-  virtual void set_host(FilterHost* filter_host);
-  virtual void Stop(const base::Closure& callback);
+  virtual void set_host(FilterHost* filter_host) OVERRIDE;
+  virtual void Stop(const base::Closure& callback) OVERRIDE;
 
   // Implementation of DataSource.
   virtual void Read(int64 position, size_t size, uint8* data,
-                    const DataSource::ReadCallback& read_callback);
-  virtual bool GetSize(int64* size_out);
-  virtual bool IsStreaming();
-  virtual void SetPreload(Preload preload);
-  virtual void SetBitrate(int bitrate);
+                    const DataSource::ReadCallback& read_callback) OVERRIDE;
+  virtual bool GetSize(int64* size_out) OVERRIDE;
+  virtual bool IsStreaming() OVERRIDE;
+  virtual void SetPreload(Preload preload) OVERRIDE;
+  virtual void SetBitrate(int bitrate) OVERRIDE;
 
  private:
   // Only allow factories and tests to create this object.
diff --git a/media/filters/file_data_source_factory.h b/media/filters/file_data_source_factory.h
index a5ed0c5..696df19 100644
--- a/media/filters/file_data_source_factory.h
+++ b/media/filters/file_data_source_factory.h
@@ -15,8 +15,9 @@ class MEDIA_EXPORT FileDataSourceFactory : public DataSourceFactory {
   virtual ~FileDataSourceFactory();
 
   // DataSourceFactory methods.
-  virtual void Build(const std::string& url, const BuildCallback& callback);
-  virtual DataSourceFactory* Clone() const;
+  virtual void Build(const std::string& url,
+                     const BuildCallback& callback) OVERRIDE;
+  virtual DataSourceFactory* Clone() const OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FileDataSourceFactory);
diff --git a/media/filters/in_memory_url_protocol.h b/media/filters/in_memory_url_protocol.h
index 1e6309a..d8fca03 100644
--- a/media/filters/in_memory_url_protocol.h
+++ b/media/filters/in_memory_url_protocol.h
@@ -21,11 +21,11 @@ class MEDIA_EXPORT InMemoryUrlProtocol : public FFmpegURLProtocol {
   virtual ~InMemoryUrlProtocol();
 
   // FFmpegURLProtocol methods.
-  virtual size_t Read(size_t size, uint8* data);
-  virtual bool GetPosition(int64* position_out);
-  virtual bool SetPosition(int64 position);
-  virtual bool GetSize(int64* size_out);
-  virtual bool IsStreaming();
+  virtual size_t Read(size_t size, uint8* data) OVERRIDE;
+  virtual bool GetPosition(int64* position_out) OVERRIDE;
+  virtual bool SetPosition(int64 position) OVERRIDE;
+  virtual bool GetSize(int64* size_out) OVERRIDE;
+  virtual bool IsStreaming() OVERRIDE;
 
  private:
   const uint8* data_;
diff --git a/media/filters/null_audio_renderer.h b/media/filters/null_audio_renderer.h
index 2f9d062..9f4ed94 100644
--- a/media/filters/null_audio_renderer.h
+++ b/media/filters/null_audio_renderer.h
@@ -31,17 +31,17 @@ class MEDIA_EXPORT NullAudioRenderer
   virtual ~NullAudioRenderer();
 
   // AudioRenderer implementation.
-  virtual void SetVolume(float volume);
+  virtual void SetVolume(float volume) OVERRIDE;
 
   // PlatformThread::Delegate implementation.
-  virtual void ThreadMain();
+  virtual void ThreadMain() OVERRIDE;
 
  protected:
   // AudioRendererBase implementation.
   virtual bool OnInitialize(int bits_per_channel,
                             ChannelLayout channel_layout,
-                            int sample_rate);
-  virtual void OnStop();
+                            int sample_rate) OVERRIDE;
+  virtual void OnStop() OVERRIDE;
 
  private:
   // A number to convert bytes written in FillBuffer to milliseconds based on
diff --git a/media/filters/null_video_renderer.h b/media/filters/null_video_renderer.h
index e3c3a6c..98d8deb 100644
--- a/media/filters/null_video_renderer.h
+++ b/media/filters/null_video_renderer.h
@@ -14,9 +14,9 @@ class NullVideoRenderer : public VideoRendererBase {
   NullVideoRenderer();
 
   // VideoRendererBase implementation.
-  virtual bool OnInitialize(VideoDecoder* decoder);
-  virtual void OnStop(const base::Closure& callback);
-  virtual void OnFrameAvailable();
+  virtual bool OnInitialize(VideoDecoder* decoder) OVERRIDE;
+  virtual void OnStop(const base::Closure& callback) OVERRIDE;
+  virtual void OnFrameAvailable() OVERRIDE;
 
  private:
   // Only allow to be deleted by reference counting.
diff --git a/media/filters/reference_audio_renderer.h b/media/filters/reference_audio_renderer.h
index 0c6bd04..e8b9921 100644
--- a/media/filters/reference_audio_renderer.h
+++ b/media/filters/reference_audio_renderer.h
@@ -31,23 +31,24 @@ class MEDIA_EXPORT ReferenceAudioRenderer
   virtual ~ReferenceAudioRenderer();
 
   // Filter implementation.
-  virtual void SetPlaybackRate(float playback_rate);
+  virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
 
   // AudioRenderer implementation.
-  virtual void SetVolume(float volume);
+  virtual void SetVolume(float volume) OVERRIDE;
 
   // AudioSourceCallback implementation.
   virtual uint32 OnMoreData(AudioOutputStream* stream, uint8* dest,
-                            uint32 len, AudioBuffersState buffers_state);
+                            uint32 len,
+                            AudioBuffersState buffers_state) OVERRIDE;
   virtual void OnClose(AudioOutputStream* stream);
-  virtual void OnError(AudioOutputStream* stream, int code);
+  virtual void OnError(AudioOutputStream* stream, int code) OVERRIDE;
 
  protected:
   // AudioRendererBase implementation.
   virtual bool OnInitialize(int bits_per_channel,
                             ChannelLayout channel_layout,
-                            int sample_rate);
-  virtual void OnStop();
+                            int sample_rate) OVERRIDE;
+  virtual void OnStop() OVERRIDE;
 
  private:
   // Audio output stream device.
diff --git a/media/filters/video_renderer_base.h b/media/filters/video_renderer_base.h
index c604f08..47c3893 100644
--- a/media/filters/video_renderer_base.h
+++ b/media/filters/video_renderer_base.h
@@ -37,21 +37,21 @@ class MEDIA_EXPORT VideoRendererBase
   virtual ~VideoRendererBase();
 
   // Filter implementation.
-  virtual void Play(const base::Closure& callback);
-  virtual void Pause(const base::Closure& callback);
-  virtual void Flush(const base::Closure& callback);
-  virtual void Stop(const base::Closure& callback);
-  virtual void SetPlaybackRate(float playback_rate);
-  virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb);
+  virtual void Play(const base::Closure& callback) OVERRIDE;
+  virtual void Pause(const base::Closure& callback) OVERRIDE;
+  virtual void Flush(const base::Closure& callback) OVERRIDE;
+  virtual void Stop(const base::Closure& callback) OVERRIDE;
+  virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
+  virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb) OVERRIDE;
 
   // VideoRenderer implementation.
   virtual void Initialize(VideoDecoder* decoder,
                           const base::Closure& callback,
-                          const StatisticsCallback& stats_callback);
-  virtual bool HasEnded();
+                          const StatisticsCallback& stats_callback) OVERRIDE;
+  virtual bool HasEnded() OVERRIDE;
 
   // PlatformThread::Delegate implementation.
-  virtual void ThreadMain();
+  virtual void ThreadMain() OVERRIDE;
 
   // Clients of this class (painter/compositor) should use GetCurrentFrame()
   // obtain ownership of VideoFrame, it should always relinquish the ownership
diff --git a/media/video/capture/fake_video_capture_device.h b/media/video/capture/fake_video_capture_device.h
index d73000d..a39e4c8 100644
--- a/media/video/capture/fake_video_capture_device.h
+++ b/media/video/capture/fake_video_capture_device.h
@@ -27,11 +27,11 @@ class MEDIA_EXPORT FakeVideoCaptureDevice : public VideoCaptureDevice {
   virtual void Allocate(int width,
                         int height,
                         int frame_rate,
-                        VideoCaptureDevice::EventHandler* observer);
-  virtual void Start();
-  virtual void Stop();
-  virtual void DeAllocate();
-  virtual const Name& device_name();
+                        VideoCaptureDevice::EventHandler* observer) OVERRIDE;
+  virtual void Start() OVERRIDE;
+  virtual void Stop() OVERRIDE;
+  virtual void DeAllocate() OVERRIDE;
+  virtual const Name& device_name() OVERRIDE;
 
  private:
   // Flag indicating the internal state.
diff --git a/media/video/capture/linux/video_capture_device_linux.h b/media/video/capture/linux/video_capture_device_linux.h
index 24caf17..25154cb 100644
--- a/media/video/capture/linux/video_capture_device_linux.h
+++ b/media/video/capture/linux/video_capture_device_linux.h
@@ -26,11 +26,11 @@ class VideoCaptureDeviceLinux : public VideoCaptureDevice {
   virtual void Allocate(int width,
                         int height,
                         int frame_rate,
-                        EventHandler* observer);
-  virtual void Start();
-  virtual void Stop();
-  virtual void DeAllocate();
-  virtual const Name& device_name();
+                        EventHandler* observer) OVERRIDE;
+  virtual void Start() OVERRIDE;
+  virtual void Stop() OVERRIDE;
+  virtual void DeAllocate() OVERRIDE;
+  virtual const Name& device_name() OVERRIDE;
 
  private:
   enum InternalState {
diff --git a/media/video/capture/win/video_capture_device_win.h b/media/video/capture/win/video_capture_device_win.h
index 392edae..71d9062 100644
--- a/media/video/capture/win/video_capture_device_win.h
+++ b/media/video/capture/win/video_capture_device_win.h
@@ -40,11 +40,11 @@ class VideoCaptureDeviceWin
   virtual void Allocate(int width,
                         int height,
                         int frame_rate,
-                        VideoCaptureDevice::EventHandler* observer);
-  virtual void Start();
-  virtual void Stop();
-  virtual void DeAllocate();
-  virtual const Name& device_name();
+                        VideoCaptureDevice::EventHandler* observer) OVERRIDE;
+  virtual void Start() OVERRIDE;
+  virtual void Stop() OVERRIDE;
+  virtual void DeAllocate() OVERRIDE;
+  virtual const Name& device_name() OVERRIDE;
 
  private:
   enum InternalState {
diff --git a/media/webm/webm_cluster_parser.h b/media/webm/webm_cluster_parser.h
index ee1caf8..5a367b0 100644
--- a/media/webm/webm_cluster_parser.h
+++ b/media/webm/webm_cluster_parser.h
@@ -37,14 +37,14 @@ class WebMClusterParser : public WebMParserClient {
 
  private:
   // WebMParserClient methods.
-  virtual bool OnListStart(int id);
-  virtual bool OnListEnd(int id);
-  virtual bool OnUInt(int id, int64 val);
-  virtual bool OnFloat(int id, double val);
-  virtual bool OnBinary(int id, const uint8* data, int size);
-  virtual bool OnString(int id, const std::string& str);
+  virtual bool OnListStart(int id) OVERRIDE;
+  virtual bool OnListEnd(int id) OVERRIDE;
+  virtual bool OnUInt(int id, int64 val) OVERRIDE;
+  virtual bool OnFloat(int id, double val) OVERRIDE;
+  virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE;
+  virtual bool OnString(int id, const std::string& str) OVERRIDE;
   virtual bool OnSimpleBlock(int track_num, int timecode, int flags,
-                             const uint8* data, int size);
+                             const uint8* data, int size) OVERRIDE;
 
   double timecode_multiplier_;  // Multiplier used to convert timecodes into
                                 // microseconds.
diff --git a/media/webm/webm_info_parser.h b/media/webm/webm_info_parser.h
index 37cf01c..102a81b 100644
--- a/media/webm/webm_info_parser.h
+++ b/media/webm/webm_info_parser.h
@@ -5,6 +5,7 @@
 #ifndef MEDIA_WEBM_WEBM_INFO_PARSER_H_
 #define MEDIA_WEBM_WEBM_INFO_PARSER_H_
 
+#include "base/compiler_specific.h"
 #include "media/webm/webm_parser.h"
 
 namespace media {
@@ -27,14 +28,14 @@ class WebMInfoParser : public WebMParserClient {
 
  private:
   // WebMParserClient methods
-  virtual bool OnListStart(int id);
-  virtual bool OnListEnd(int id);
-  virtual bool OnUInt(int id, int64 val);
-  virtual bool OnFloat(int id, double val);
-  virtual bool OnBinary(int id, const uint8* data, int size);
-  virtual bool OnString(int id, const std::string& str);
+  virtual bool OnListStart(int id) OVERRIDE;
+  virtual bool OnListEnd(int id) OVERRIDE;
+  virtual bool OnUInt(int id, int64 val) OVERRIDE;
+  virtual bool OnFloat(int id, double val) OVERRIDE;
+  virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE;
+  virtual bool OnString(int id, const std::string& str) OVERRIDE;
   virtual bool OnSimpleBlock(int track_num, int timecode, int flags,
-                             const uint8* data, int size);
+                             const uint8* data, int size) OVERRIDE;
 
   int64 timecode_scale_;
   double duration_;
diff --git a/media/webm/webm_tracks_parser.h b/media/webm/webm_tracks_parser.h
index 02dc10d..c4eff0d 100644
--- a/media/webm/webm_tracks_parser.h
+++ b/media/webm/webm_tracks_parser.h
@@ -5,9 +5,9 @@
 #ifndef MEDIA_WEBM_WEBM_TRACKS_PARSER_H_
 #define MEDIA_WEBM_WEBM_TRACKS_PARSER_H_
 
-#include "media/webm/webm_parser.h"
-
+#include "base/compiler_specific.h"
 #include "base/time.h"
+#include "media/webm/webm_parser.h"
 
 namespace media {
 
@@ -36,14 +36,14 @@ class WebMTracksParser : public WebMParserClient {
 
  private:
   // WebMParserClient methods
-  virtual bool OnListStart(int id);
-  virtual bool OnListEnd(int id);
-  virtual bool OnUInt(int id, int64 val);
-  virtual bool OnFloat(int id, double val);
-  virtual bool OnBinary(int id, const uint8* data, int size);
-  virtual bool OnString(int id, const std::string& str);
+  virtual bool OnListStart(int id) OVERRIDE;
+  virtual bool OnListEnd(int id) OVERRIDE;
+  virtual bool OnUInt(int id, int64 val) OVERRIDE;
+  virtual bool OnFloat(int id, double val) OVERRIDE;
+  virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE;
+  virtual bool OnString(int id, const std::string& str) OVERRIDE;
   virtual bool OnSimpleBlock(int track_num, int timecode, int flags,
-                             const uint8* data, int size);
+                             const uint8* data, int size) OVERRIDE;
   int64 timecode_scale_;
 
   int64 track_type_;