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}

69 files changed, 182 insertions, 192 deletions

diff --git a/media/audio/alsa/alsa_input.h b/media/audio/alsa/alsa_input.h
index ef7cb2c..b04e628 100644
--- a/media/audio/alsa/alsa_input.h
+++ b/media/audio/alsa/alsa_input.h
@@ -39,17 +39,17 @@ class AlsaPcmInputStream : public AgcAudioStream<AudioInputStream> {
                      const AudioParameters& params,
                      AlsaWrapper* wrapper);
 
-  virtual ~AlsaPcmInputStream();
+  ~AlsaPcmInputStream() override;
 
   // Implementation of AudioInputStream.
-  virtual bool Open() override;
-  virtual void Start(AudioInputCallback* callback) override;
-  virtual void Stop() override;
-  virtual void Close() override;
-  virtual double GetMaxVolume() override;
-  virtual void SetVolume(double volume) override;
-  virtual double GetVolume() override;
-  virtual bool IsMuted() override;
+  bool Open() override;
+  void Start(AudioInputCallback* callback) override;
+  void Stop() override;
+  void Close() override;
+  double GetMaxVolume() override;
+  void SetVolume(double volume) override;
+  double GetVolume() override;
+  bool IsMuted() override;
 
  private:
   // Logs the error and invokes any registered callbacks.
diff --git a/media/audio/alsa/alsa_output.h b/media/audio/alsa/alsa_output.h
index dfc044d..fd0910a 100644
--- a/media/audio/alsa/alsa_output.h
+++ b/media/audio/alsa/alsa_output.h
@@ -72,15 +72,15 @@ class MEDIA_EXPORT AlsaPcmOutputStream : public AudioOutputStream {
                       AlsaWrapper* wrapper,
                       AudioManagerBase* manager);
 
-  virtual ~AlsaPcmOutputStream();
+  ~AlsaPcmOutputStream() override;
 
   // Implementation of AudioOutputStream.
-  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;
+  bool Open() override;
+  void Close() override;
+  void Start(AudioSourceCallback* callback) override;
+  void Stop() override;
+  void SetVolume(double volume) override;
+  void GetVolume(double* volume) override;
 
  private:
   friend class AlsaPcmOutputStreamTest;
diff --git a/media/audio/alsa/audio_manager_alsa.h b/media/audio/alsa/audio_manager_alsa.h
index 40801fc..46a28b1 100644
--- a/media/audio/alsa/audio_manager_alsa.h
+++ b/media/audio/alsa/audio_manager_alsa.h
@@ -22,31 +22,31 @@ class MEDIA_EXPORT AudioManagerAlsa : public AudioManagerBase {
   static void ShowLinuxAudioInputSettings();
 
   // Implementation of AudioManager.
-  virtual bool HasAudioOutputDevices() override;
-  virtual bool HasAudioInputDevices() override;
-  virtual void ShowAudioInputSettings() override;
-  virtual void GetAudioInputDeviceNames(
-      AudioDeviceNames* device_names) override;
-  virtual void GetAudioOutputDeviceNames(
-      AudioDeviceNames* device_names) override;
-  virtual AudioParameters GetInputStreamParameters(
+  bool HasAudioOutputDevices() override;
+  bool HasAudioInputDevices() override;
+  void ShowAudioInputSettings() override;
+  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
+  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
+  AudioParameters GetInputStreamParameters(
       const std::string& device_id) override;
 
   // Implementation of AudioManagerBase.
-  virtual AudioOutputStream* MakeLinearOutputStream(
+  AudioOutputStream* MakeLinearOutputStream(
       const AudioParameters& params) override;
-  virtual AudioOutputStream* MakeLowLatencyOutputStream(
+  AudioOutputStream* MakeLowLatencyOutputStream(
+      const AudioParameters& params,
+      const std::string& device_id) override;
+  AudioInputStream* MakeLinearInputStream(
+      const AudioParameters& params,
+      const std::string& device_id) override;
+  AudioInputStream* MakeLowLatencyInputStream(
       const AudioParameters& params,
       const std::string& device_id) override;
-  virtual AudioInputStream* MakeLinearInputStream(
-      const AudioParameters& params, const std::string& device_id) override;
-  virtual AudioInputStream* MakeLowLatencyInputStream(
-      const AudioParameters& params, const std::string& device_id) override;
 
  protected:
-  virtual ~AudioManagerAlsa();
+  ~AudioManagerAlsa() override;
 
-  virtual AudioParameters GetPreferredOutputStreamParameters(
+  AudioParameters GetPreferredOutputStreamParameters(
       const std::string& output_device_id,
       const AudioParameters& input_params) override;
 
diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h
index 19d04ec..5bfe6bd 100644
--- a/media/audio/audio_input_controller.h
+++ b/media/audio/audio_input_controller.h
@@ -266,7 +266,7 @@ class MEDIA_EXPORT AudioInputController
                        SyncWriter* sync_writer,
                        UserInputMonitor* user_input_monitor,
                        const bool agc_is_enabled);
-  virtual ~AudioInputController();
+  ~AudioInputController() override;
 
   // Methods called on the audio thread (owned by the AudioManager).
   void DoCreate(AudioManager* audio_manager,
diff --git a/media/audio/audio_input_controller_unittest.cc b/media/audio/audio_input_controller_unittest.cc
index e71232d..fc2cbe1 100644
--- a/media/audio/audio_input_controller_unittest.cc
+++ b/media/audio/audio_input_controller_unittest.cc
@@ -67,7 +67,7 @@ class MockAudioInputControllerEventHandler
 class AudioInputControllerTest : public testing::Test {
  public:
   AudioInputControllerTest() {}
-  virtual ~AudioInputControllerTest() {}
+  ~AudioInputControllerTest() override {}
 
  protected:
   base::MessageLoop message_loop_;
diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc
index 9b3e71a..1d5470b 100644
--- a/media/audio/audio_input_unittest.cc
+++ b/media/audio/audio_input_unittest.cc
@@ -54,9 +54,7 @@ class AudioInputTest : public testing::Test {
     base::RunLoop().RunUntilIdle();
   }
 
-  virtual ~AudioInputTest() {
-    base::RunLoop().RunUntilIdle();
-  }
+  ~AudioInputTest() override { base::RunLoop().RunUntilIdle(); }
 
  protected:
   AudioManager* audio_manager() { return audio_manager_.get(); }
diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc
index 49a0e1c..7d8fc0a 100644
--- a/media/audio/audio_low_latency_input_output_unittest.cc
+++ b/media/audio/audio_low_latency_input_output_unittest.cc
@@ -93,9 +93,9 @@ struct AudioDelayState {
 class MockAudioManager : public AudioManagerAnyPlatform {
  public:
   MockAudioManager() : AudioManagerAnyPlatform(&fake_audio_log_factory_) {}
-  virtual ~MockAudioManager() {}
+  ~MockAudioManager() override {}
 
-  virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override {
+  scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override {
     return base::MessageLoop::current()->message_loop_proxy();
   }
 
@@ -109,7 +109,7 @@ class AudioLowLatencyInputOutputTest : public testing::Test {
  protected:
   AudioLowLatencyInputOutputTest() {}
 
-  virtual ~AudioLowLatencyInputOutputTest() {}
+  ~AudioLowLatencyInputOutputTest() override {}
 
   AudioManager* audio_manager() { return &mock_audio_manager_; }
   base::MessageLoopForUI* message_loop() { return &message_loop_; }
@@ -162,7 +162,7 @@ class FullDuplexAudioSinkSource
     delay_states_.reset(new AudioDelayState[kMaxDelayMeasurements]);
   }
 
-  virtual ~FullDuplexAudioSinkSource() {
+  ~FullDuplexAudioSinkSource() override {
     // Get complete file path to output file in the directory containing
     // media_unittests.exe. Example: src/build/Debug/audio_delay_values_ms.txt.
     base::FilePath file_name;
@@ -191,10 +191,10 @@ class FullDuplexAudioSinkSource
   }
 
   // AudioInputStream::AudioInputCallback.
-  virtual void OnData(AudioInputStream* stream,
-                      const AudioBus* src,
-                      uint32 hardware_delay_bytes,
-                      double volume) override {
+  void OnData(AudioInputStream* stream,
+              const AudioBus* src,
+              uint32 hardware_delay_bytes,
+              double volume) override {
     base::AutoLock lock(lock_);
 
     // Update three components in the AudioDelayState for this recorded
@@ -222,11 +222,10 @@ class FullDuplexAudioSinkSource
     // }
   }
 
-  virtual void OnError(AudioInputStream* stream) override {}
+  void OnError(AudioInputStream* stream) override {}
 
   // AudioOutputStream::AudioSourceCallback.
-  virtual int OnMoreData(AudioBus* audio_bus,
-                         uint32 total_bytes_delay) override {
+  int OnMoreData(AudioBus* audio_bus, uint32 total_bytes_delay) override {
     base::AutoLock lock(lock_);
 
     // Update one component in the AudioDelayState for the packet
@@ -254,7 +253,7 @@ class FullDuplexAudioSinkSource
     return 0;
   }
 
-  virtual void OnError(AudioOutputStream* stream) override {}
+  void OnError(AudioOutputStream* stream) override {}
 
  protected:
   // Converts from bytes to milliseconds taking the sample rate and size
diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc
index a4ecdb8..d158898 100644
--- a/media/audio/audio_output_controller_unittest.cc
+++ b/media/audio/audio_output_controller_unittest.cc
@@ -99,8 +99,7 @@ class AudioOutputControllerTest : public testing::Test {
         pause_event_(false, false) {
   }
 
-  virtual ~AudioOutputControllerTest() {
-  }
+  ~AudioOutputControllerTest() override {}
 
  protected:
   void Create(int samples_per_packet) {
diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
index 7f3c3d8..66f8987 100644
--- a/media/audio/audio_output_proxy_unittest.cc
+++ b/media/audio/audio_output_proxy_unittest.cc
@@ -137,7 +137,7 @@ namespace media {
 
 class AudioOutputProxyTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     EXPECT_CALL(manager_, GetTaskRunner())
         .WillRepeatedly(Return(message_loop_.message_loop_proxy()));
     EXPECT_CALL(manager_, GetWorkerTaskRunner())
@@ -150,7 +150,7 @@ class AudioOutputProxyTest : public testing::Test {
     InitDispatcher(base::TimeDelta::FromMilliseconds(kTestCloseDelayMs));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     // This is necessary to free all proxy objects that have been
     // closed by the test.
     message_loop_.RunUntilIdle();
@@ -413,9 +413,7 @@ class AudioOutputProxyTest : public testing::Test {
 
 class AudioOutputResamplerTest : public AudioOutputProxyTest {
  public:
-  virtual void TearDown() {
-    AudioOutputProxyTest::TearDown();
-  }
+  void TearDown() override { AudioOutputProxyTest::TearDown(); }
 
   void InitDispatcher(base::TimeDelta close_delay) override {
     // Use a low sample rate and large buffer size when testing otherwise the
diff --git a/media/audio/fake_audio_consumer_unittest.cc b/media/audio/fake_audio_consumer_unittest.cc
index ad04cb6..ab97eae 100644
--- a/media/audio/fake_audio_consumer_unittest.cc
+++ b/media/audio/fake_audio_consumer_unittest.cc
@@ -26,7 +26,7 @@ class FakeAudioConsumerTest : public testing::Test {
         static_cast<float>(params_.sample_rate()));
   }
 
-  virtual ~FakeAudioConsumerTest() {}
+  ~FakeAudioConsumerTest() override {}
 
   void ConsumeData(AudioBus* audio_bus) {
     source_.OnMoreData(audio_bus, 0);
diff --git a/media/audio/pulse/audio_manager_pulse.h b/media/audio/pulse/audio_manager_pulse.h
index 65462c4..b704a09 100644
--- a/media/audio/pulse/audio_manager_pulse.h
+++ b/media/audio/pulse/audio_manager_pulse.h
@@ -17,34 +17,34 @@ namespace media {
 class MEDIA_EXPORT AudioManagerPulse : public AudioManagerBase {
  public:
   AudioManagerPulse(AudioLogFactory* audio_log_factory);
-  virtual ~AudioManagerPulse();
+  ~AudioManagerPulse() override;
 
   static AudioManager* Create(AudioLogFactory* audio_log_factory);
 
   // Implementation of AudioManager.
-  virtual bool HasAudioOutputDevices() override;
-  virtual bool HasAudioInputDevices() override;
-  virtual void ShowAudioInputSettings() override;
-  virtual void GetAudioInputDeviceNames(
-      AudioDeviceNames* device_names) override;
-  virtual void GetAudioOutputDeviceNames(
-      AudioDeviceNames* device_names) override;
-  virtual AudioParameters GetInputStreamParameters(
+  bool HasAudioOutputDevices() override;
+  bool HasAudioInputDevices() override;
+  void ShowAudioInputSettings() override;
+  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
+  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
+  AudioParameters GetInputStreamParameters(
       const std::string& device_id) override;
 
   // Implementation of AudioManagerBase.
-  virtual AudioOutputStream* MakeLinearOutputStream(
+  AudioOutputStream* MakeLinearOutputStream(
       const AudioParameters& params) override;
-  virtual AudioOutputStream* MakeLowLatencyOutputStream(
+  AudioOutputStream* MakeLowLatencyOutputStream(
+      const AudioParameters& params,
+      const std::string& device_id) override;
+  AudioInputStream* MakeLinearInputStream(
+      const AudioParameters& params,
+      const std::string& device_id) override;
+  AudioInputStream* MakeLowLatencyInputStream(
       const AudioParameters& params,
       const std::string& device_id) override;
-  virtual AudioInputStream* MakeLinearInputStream(
-      const AudioParameters& params, const std::string& device_id) override;
-  virtual AudioInputStream* MakeLowLatencyInputStream(
-      const AudioParameters& params, const std::string& device_id) override;
 
  protected:
-  virtual AudioParameters GetPreferredOutputStreamParameters(
+  AudioParameters GetPreferredOutputStreamParameters(
       const std::string& output_device_id,
       const AudioParameters& input_params) override;
 
diff --git a/media/audio/pulse/pulse_input.h b/media/audio/pulse/pulse_input.h
index dd42b31..e3316cd 100644
--- a/media/audio/pulse/pulse_input.h
+++ b/media/audio/pulse/pulse_input.h
@@ -27,17 +27,17 @@ class PulseAudioInputStream : public AgcAudioStream<AudioInputStream> {
                         pa_threaded_mainloop* mainloop,
                         pa_context* context);
 
-  virtual ~PulseAudioInputStream();
+  ~PulseAudioInputStream() override;
 
   // Implementation of AudioInputStream.
-  virtual bool Open() override;
-  virtual void Start(AudioInputCallback* callback) override;
-  virtual void Stop() override;
-  virtual void Close() override;
-  virtual double GetMaxVolume() override;
-  virtual void SetVolume(double volume) override;
-  virtual double GetVolume() override;
-  virtual bool IsMuted() override;
+  bool Open() override;
+  void Start(AudioInputCallback* callback) override;
+  void Stop() override;
+  void Close() override;
+  double GetMaxVolume() override;
+  void SetVolume(double volume) override;
+  double GetVolume() override;
+  bool IsMuted() override;
 
  private:
   // PulseAudio Callbacks.
diff --git a/media/audio/pulse/pulse_output.h b/media/audio/pulse/pulse_output.h
index b2be95f..6ec55a3 100644
--- a/media/audio/pulse/pulse_output.h
+++ b/media/audio/pulse/pulse_output.h
@@ -41,15 +41,15 @@ class PulseAudioOutputStream : public AudioOutputStream {
                          const std::string& device_id,
                          AudioManagerBase* manager);
 
-  virtual ~PulseAudioOutputStream();
+  ~PulseAudioOutputStream() override;
 
   // Implementation of AudioOutputStream.
-  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;
+  bool Open() override;
+  void Close() override;
+  void Start(AudioSourceCallback* callback) override;
+  void Stop() override;
+  void SetVolume(double volume) override;
+  void GetVolume(double* volume) override;
 
  private:
   // Called by PulseAudio when |pa_stream_| change state.  If an unexpected
diff --git a/media/audio/sounds/audio_stream_handler_unittest.cc b/media/audio/sounds/audio_stream_handler_unittest.cc
index db4961a..234ac9d 100644
--- a/media/audio/sounds/audio_stream_handler_unittest.cc
+++ b/media/audio/sounds/audio_stream_handler_unittest.cc
@@ -22,16 +22,16 @@ namespace media {
 class AudioStreamHandlerTest : public testing::Test {
  public:
   AudioStreamHandlerTest() {}
-  virtual ~AudioStreamHandlerTest() {}
+  ~AudioStreamHandlerTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     audio_manager_.reset(AudioManager::CreateForTesting());
 
     base::StringPiece data(kTestAudioData, arraysize(kTestAudioData));
     audio_stream_handler_.reset(new AudioStreamHandler(data));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     audio_stream_handler_.reset();
     audio_manager_.reset();
   }
diff --git a/media/audio/sounds/sounds_manager_unittest.cc b/media/audio/sounds/sounds_manager_unittest.cc
index 101f6a3..9741e6e 100644
--- a/media/audio/sounds/sounds_manager_unittest.cc
+++ b/media/audio/sounds/sounds_manager_unittest.cc
@@ -21,14 +21,14 @@ namespace media {
 class SoundsManagerTest : public testing::Test {
  public:
   SoundsManagerTest() {}
-  virtual ~SoundsManagerTest() {}
+  ~SoundsManagerTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     audio_manager_.reset(AudioManager::CreateForTesting());
     SoundsManager::Create();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     SoundsManager::Shutdown();
     audio_manager_.reset();
   }
diff --git a/media/base/audio_block_fifo_unittest.cc b/media/base/audio_block_fifo_unittest.cc
index e12167c..b46a139 100644
--- a/media/base/audio_block_fifo_unittest.cc
+++ b/media/base/audio_block_fifo_unittest.cc
@@ -12,7 +12,7 @@ namespace media {
 class AudioBlockFifoTest : public testing::Test {
  public:
   AudioBlockFifoTest() {}
-  virtual ~AudioBlockFifoTest() {}
+  ~AudioBlockFifoTest() override {}
 
   void PushAndVerify(AudioBlockFifo* fifo, int frames_to_push,
                      int channels, int block_frames, int max_frames) {
diff --git a/media/base/audio_bus_unittest.cc b/media/base/audio_bus_unittest.cc
index 2f1e02c..85d6aa3 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() {}
-  virtual ~AudioBusTest() {
+  ~AudioBusTest() override {
     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 70ad969..1bdd9c6 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() {}
-  virtual ~AudioFifoTest() {}
+  ~AudioFifoTest() override {}
 
   void VerifyValue(const float data[], int size, float value) {
     for (int i = 0; i < size; ++i)
diff --git a/media/base/audio_hash_unittest.cc b/media/base/audio_hash_unittest.cc
index bdc5a2c..1adf5bc 100644
--- a/media/base/audio_hash_unittest.cc
+++ b/media/base/audio_hash_unittest.cc
@@ -38,7 +38,7 @@ class AudioHashTest : public testing::Test {
     }
   }
 
-  virtual ~AudioHashTest() {}
+  ~AudioHashTest() override {}
 
  protected:
   scoped_ptr<AudioBus> bus_one_;
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc
index 9528cf7..5bb48ad 100644
--- a/media/base/pipeline_unittest.cc
+++ b/media/base/pipeline_unittest.cc
@@ -778,7 +778,7 @@ class PipelineTeardownTest : public PipelineTest {
   };
 
   PipelineTeardownTest() {}
-  virtual ~PipelineTeardownTest() {}
+  ~PipelineTeardownTest() override {}
 
   void RunTest(TeardownState state, StopOrError stop_or_error) {
     switch (state) {
diff --git a/media/base/seekable_buffer_unittest.cc b/media/base/seekable_buffer_unittest.cc
index 86bcbf4..c284425 100644
--- a/media/base/seekable_buffer_unittest.cc
+++ b/media/base/seekable_buffer_unittest.cc
@@ -23,7 +23,7 @@ class SeekableBufferTest : public testing::Test {
   static const int kBufferSize = 4096;
   static const int kWriteSize = 512;
 
-  virtual void SetUp() {
+  void SetUp() override {
     // Note: We use srand() and rand() rather than base::RandXXX() to improve
     // unit test performance.  We don't need good random numbers, just
     // something that generates "mixed data."
diff --git a/media/base/serial_runner_unittest.cc b/media/base/serial_runner_unittest.cc
index f18fef8..e2e8347 100644
--- a/media/base/serial_runner_unittest.cc
+++ b/media/base/serial_runner_unittest.cc
@@ -15,7 +15,7 @@ class SerialRunnerTest : public ::testing::Test {
  public:
   SerialRunnerTest()
       : inside_start_(false), done_called_(false), done_status_(PIPELINE_OK) {}
-  virtual ~SerialRunnerTest() {}
+  ~SerialRunnerTest() override {}
 
   void RunSerialRunner() {
     message_loop_.PostTask(FROM_HERE, base::Bind(
diff --git a/media/base/user_input_monitor_linux.cc b/media/base/user_input_monitor_linux.cc
index e7ac0c8..961a9c8 100644
--- a/media/base/user_input_monitor_linux.cc
+++ b/media/base/user_input_monitor_linux.cc
@@ -49,10 +49,10 @@ class UserInputMonitorLinuxCore
       const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
       const scoped_refptr<UserInputMonitor::MouseListenerList>&
           mouse_listeners);
-  virtual ~UserInputMonitorLinuxCore();
+  ~UserInputMonitorLinuxCore() override;
 
   // DestructionObserver overrides.
-  virtual void WillDestroyCurrentMessageLoop() override;
+  void WillDestroyCurrentMessageLoop() override;
 
   size_t GetKeyPressCount() const;
   void StartMonitor(EventType type);
@@ -60,8 +60,8 @@ class UserInputMonitorLinuxCore
 
  private:
   // base::MessagePumpLibevent::Watcher interface.
-  virtual void OnFileCanReadWithoutBlocking(int fd) override;
-  virtual void OnFileCanWriteWithoutBlocking(int fd) override;
+  void OnFileCanReadWithoutBlocking(int fd) override;
+  void OnFileCanWriteWithoutBlocking(int fd) override;
 
   // Processes key and mouse events.
   void ProcessXEvent(xEvent* event);
@@ -88,17 +88,17 @@ class UserInputMonitorLinux : public UserInputMonitor {
  public:
   explicit UserInputMonitorLinux(
       const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner);
-  virtual ~UserInputMonitorLinux();
+  ~UserInputMonitorLinux() override;
 
   // Public UserInputMonitor overrides.
-  virtual size_t GetKeyPressCount() const override;
+  size_t GetKeyPressCount() const override;
 
  private:
   // Private UserInputMonitor overrides.
-  virtual void StartKeyboardMonitoring() override;
-  virtual void StopKeyboardMonitoring() override;
-  virtual void StartMouseMonitoring() override;
-  virtual void StopMouseMonitoring() override;
+  void StartKeyboardMonitoring() override;
+  void StopKeyboardMonitoring() override;
+  void StartMouseMonitoring() override;
+  void StopMouseMonitoring() override;
 
   scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
   UserInputMonitorLinuxCore* core_;
diff --git a/media/base/video_util_unittest.cc b/media/base/video_util_unittest.cc
index 4f4ee31..9ac13c1 100644
--- a/media/base/video_util_unittest.cc
+++ b/media/base/video_util_unittest.cc
@@ -18,7 +18,7 @@ class VideoUtilTest : public testing::Test {
         v_stride_(0) {
   }
 
-  virtual ~VideoUtilTest() {}
+  ~VideoUtilTest() override {}
 
   void CreateSourceFrame(int width, int height,
                          int y_stride, int u_stride, int v_stride) {
diff --git a/media/base/wall_clock_time_source_unittest.cc b/media/base/wall_clock_time_source_unittest.cc
index 2b03151..08a424d 100644
--- a/media/base/wall_clock_time_source_unittest.cc
+++ b/media/base/wall_clock_time_source_unittest.cc
@@ -14,7 +14,7 @@ class WallClockTimeSourceTest : public testing::Test {
     time_source_.SetTickClockForTesting(
         scoped_ptr<base::TickClock>(tick_clock_));
   }
-  virtual ~WallClockTimeSourceTest() {}
+  ~WallClockTimeSourceTest() override {}
 
   void AdvanceTimeInSeconds(int seconds) {
     tick_clock_->Advance(base::TimeDelta::FromSeconds(seconds));
diff --git a/media/cast/logging/encoding_event_subscriber_unittest.cc b/media/cast/logging/encoding_event_subscriber_unittest.cc
index 3d77a62..0e33c5f 100644
--- a/media/cast/logging/encoding_event_subscriber_unittest.cc
+++ b/media/cast/logging/encoding_event_subscriber_unittest.cc
@@ -47,7 +47,7 @@ class EncodingEventSubscriberTest : public ::testing::Test {
         event_subscriber_.get());
   }
 
-  virtual ~EncodingEventSubscriberTest() {
+  ~EncodingEventSubscriberTest() override {
     if (event_subscriber_) {
       cast_environment_->Logging()->RemoveRawEventSubscriber(
           event_subscriber_.get());
diff --git a/media/cast/logging/logging_impl_unittest.cc b/media/cast/logging/logging_impl_unittest.cc
index 712d76b..eae1dcd 100644
--- a/media/cast/logging/logging_impl_unittest.cc
+++ b/media/cast/logging/logging_impl_unittest.cc
@@ -33,7 +33,7 @@ class LoggingImplTest : public ::testing::Test {
     logging_.AddRawEventSubscriber(&event_subscriber_);
   }
 
-  virtual ~LoggingImplTest() {
+  ~LoggingImplTest() override {
     logging_.RemoveRawEventSubscriber(&event_subscriber_);
   }
 
diff --git a/media/cast/logging/logging_raw_unittest.cc b/media/cast/logging/logging_raw_unittest.cc
index 0b7c05a..40a1ae5 100644
--- a/media/cast/logging/logging_raw_unittest.cc
+++ b/media/cast/logging/logging_raw_unittest.cc
@@ -16,7 +16,7 @@ class LoggingRawTest : public ::testing::Test {
     raw_.AddSubscriber(&event_subscriber_);
   }
 
-  virtual ~LoggingRawTest() { raw_.RemoveSubscriber(&event_subscriber_); }
+  ~LoggingRawTest() override { raw_.RemoveSubscriber(&event_subscriber_); }
 
   LoggingRaw raw_;
   SimpleEventSubscriber event_subscriber_;
diff --git a/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc b/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc
index c1059ae..bc1fc51 100644
--- a/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc
+++ b/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc
@@ -28,7 +28,7 @@ class ReceiverTimeOffsetEstimatorImplTest : public ::testing::Test {
     cast_environment_->Logging()->AddRawEventSubscriber(&estimator_);
   }
 
-  virtual ~ReceiverTimeOffsetEstimatorImplTest() {
+  ~ReceiverTimeOffsetEstimatorImplTest() override {
     cast_environment_->Logging()->RemoveRawEventSubscriber(&estimator_);
   }
 
diff --git a/media/cast/logging/serialize_deserialize_test.cc b/media/cast/logging/serialize_deserialize_test.cc
index 8c8e2fe..af36cda 100644
--- a/media/cast/logging/serialize_deserialize_test.cc
+++ b/media/cast/logging/serialize_deserialize_test.cc
@@ -43,7 +43,7 @@ class SerializeDeserializeTest : public ::testing::Test {
   SerializeDeserializeTest()
       : serialized_(new char[kMaxSerializedBytes]), output_bytes_(0) {}
 
-  virtual ~SerializeDeserializeTest() {}
+  ~SerializeDeserializeTest() override {}
 
   void Init() {
     metadata_.set_first_rtp_timestamp(12345678 * 90);
diff --git a/media/cast/logging/simple_event_subscriber_unittest.cc b/media/cast/logging/simple_event_subscriber_unittest.cc
index 311a234..653eecd 100644
--- a/media/cast/logging/simple_event_subscriber_unittest.cc
+++ b/media/cast/logging/simple_event_subscriber_unittest.cc
@@ -28,7 +28,7 @@ class SimpleEventSubscriberTest : public ::testing::Test {
     cast_environment_->Logging()->AddRawEventSubscriber(&event_subscriber_);
   }
 
-  virtual ~SimpleEventSubscriberTest() {
+  ~SimpleEventSubscriberTest() override {
     cast_environment_->Logging()->RemoveRawEventSubscriber(&event_subscriber_);
   }
 
diff --git a/media/cast/logging/stats_event_subscriber_unittest.cc b/media/cast/logging/stats_event_subscriber_unittest.cc
index 95616b1..41388e0 100644
--- a/media/cast/logging/stats_event_subscriber_unittest.cc
+++ b/media/cast/logging/stats_event_subscriber_unittest.cc
@@ -38,7 +38,7 @@ class StatsEventSubscriberTest : public ::testing::Test {
         &fake_offset_estimator_);
   }
 
-  virtual ~StatsEventSubscriberTest() {
+  ~StatsEventSubscriberTest() override {
     if (subscriber_.get())
       cast_environment_->Logging()->RemoveRawEventSubscriber(subscriber_.get());
     cast_environment_->Logging()->RemoveRawEventSubscriber(
diff --git a/media/cast/net/cast_transport_sender_impl_unittest.cc b/media/cast/net/cast_transport_sender_impl_unittest.cc
index 8330627..7b95157 100644
--- a/media/cast/net/cast_transport_sender_impl_unittest.cc
+++ b/media/cast/net/cast_transport_sender_impl_unittest.cc
@@ -73,7 +73,7 @@ class CastTransportSenderImplTest : public ::testing::Test {
     task_runner_ = new test::FakeSingleThreadTaskRunner(&testing_clock_);
   }
 
-  virtual ~CastTransportSenderImplTest() {}
+  ~CastTransportSenderImplTest() override {}
 
   void InitWithoutLogging() {
     transport_sender_.reset(
diff --git a/media/cast/net/frame_id_wrap_helper_test.cc b/media/cast/net/frame_id_wrap_helper_test.cc
index c40979d..499d7de 100644
--- a/media/cast/net/frame_id_wrap_helper_test.cc
+++ b/media/cast/net/frame_id_wrap_helper_test.cc
@@ -12,7 +12,7 @@ namespace cast {
 class FrameIdWrapHelperTest : public ::testing::Test {
  protected:
   FrameIdWrapHelperTest() {}
-  virtual ~FrameIdWrapHelperTest() {}
+  ~FrameIdWrapHelperTest() override {}
 
   void RunOneTest(uint32 starting_point, int iterations) {
     const int window_size = 127;
diff --git a/media/cast/net/pacing/paced_sender_unittest.cc b/media/cast/net/pacing/paced_sender_unittest.cc
index 4a8810d..62ad8ea 100644
--- a/media/cast/net/pacing/paced_sender_unittest.cc
+++ b/media/cast/net/pacing/paced_sender_unittest.cc
@@ -73,7 +73,7 @@ class PacedSenderTest : public ::testing::Test {
     paced_sender_->RegisterVideoSsrc(kVideoSsrc);
   }
 
-  virtual ~PacedSenderTest() {
+  ~PacedSenderTest() override {
     logging_.RemoveRawEventSubscriber(&subscriber_);
   }
 
diff --git a/media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc b/media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc
index 422340c..35b72a7 100644
--- a/media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc
+++ b/media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc
@@ -33,9 +33,9 @@ class ReceiverRtcpEventSubscriberTest : public ::testing::Test {
             task_runner_,
             task_runner_)) {}
 
-  virtual ~ReceiverRtcpEventSubscriberTest() {}
+  ~ReceiverRtcpEventSubscriberTest() override {}
 
-  virtual void TearDown() override {
+  void TearDown() override {
     if (event_subscriber_) {
       cast_environment_->Logging()->RemoveRawEventSubscriber(
           event_subscriber_.get());
diff --git a/media/cast/net/rtcp/rtcp_unittest.cc b/media/cast/net/rtcp/rtcp_unittest.cc
index 9363f70..707cd95 100644
--- a/media/cast/net/rtcp/rtcp_unittest.cc
+++ b/media/cast/net/rtcp/rtcp_unittest.cc
@@ -119,7 +119,7 @@ class RtcpTest : public ::testing::Test {
     receiver_to_sender_.set_rtcp_destination(&rtcp_for_sender_);
   }
 
-  virtual ~RtcpTest() {}
+  ~RtcpTest() override {}
 
   scoped_ptr<base::SimpleTestTickClock> sender_clock_;
   scoped_ptr<test::SkewedTickClock> receiver_clock_;
diff --git a/media/cast/net/rtp/cast_message_builder_unittest.cc b/media/cast/net/rtp/cast_message_builder_unittest.cc
index 7080900..240d04a 100644
--- a/media/cast/net/rtp/cast_message_builder_unittest.cc
+++ b/media/cast/net/rtp/cast_message_builder_unittest.cc
@@ -100,7 +100,7 @@ class CastMessageBuilderTest : public ::testing::Test {
         base::TimeDelta::FromMilliseconds(kStartMillisecond));
   }
 
-  virtual ~CastMessageBuilderTest() {}
+  ~CastMessageBuilderTest() override {}
 
   void SetFrameIds(uint32 frame_id, uint32 reference_frame_id) {
     rtp_header_.frame_id = frame_id;
diff --git a/media/cast/net/rtp/frame_buffer_unittest.cc b/media/cast/net/rtp/frame_buffer_unittest.cc
index 64b2734..f13771a 100644
--- a/media/cast/net/rtp/frame_buffer_unittest.cc
+++ b/media/cast/net/rtp/frame_buffer_unittest.cc
@@ -15,7 +15,7 @@ class FrameBufferTest : public ::testing::Test {
     payload_.assign(kMaxIpPacketSize, 0);
   }
 
-  virtual ~FrameBufferTest() {}
+  ~FrameBufferTest() override {}
 
   FrameBuffer buffer_;
   std::vector<uint8> payload_;
diff --git a/media/cast/net/rtp/framer_unittest.cc b/media/cast/net/rtp/framer_unittest.cc
index d8c8aef..c06b1d9 100644
--- a/media/cast/net/rtp/framer_unittest.cc
+++ b/media/cast/net/rtp/framer_unittest.cc
@@ -22,7 +22,7 @@ class FramerTest : public ::testing::Test {
         .WillRepeatedly(testing::Return());
   }
 
-  virtual ~FramerTest() {}
+  ~FramerTest() override {}
 
   std::vector<uint8> payload_;
   RtpCastHeader rtp_header_;
diff --git a/media/cast/net/rtp/receiver_stats_unittest.cc b/media/cast/net/rtp/receiver_stats_unittest.cc
index caedf84..7bb3dd1 100644
--- a/media/cast/net/rtp/receiver_stats_unittest.cc
+++ b/media/cast/net/rtp/receiver_stats_unittest.cc
@@ -30,7 +30,7 @@ class ReceiverStatsTest : public ::testing::Test {
     start_time_ = testing_clock_.NowTicks();
     delta_increments_ = base::TimeDelta::FromMilliseconds(kStdTimeIncrementMs);
   }
-  virtual ~ReceiverStatsTest() {}
+  ~ReceiverStatsTest() override {}
 
   uint32 ExpectedJitter(uint32 const_interval, int num_packets) {
     float jitter = 0;
diff --git a/media/cast/net/rtp/rtp_parser_unittest.cc b/media/cast/net/rtp/rtp_parser_unittest.cc
index e5c08fe..40822c8 100644
--- a/media/cast/net/rtp/rtp_parser_unittest.cc
+++ b/media/cast/net/rtp/rtp_parser_unittest.cc
@@ -34,7 +34,7 @@ class RtpParserTest : public ::testing::Test {
     cast_header_.marker = true;
   }
 
-  virtual ~RtpParserTest() {}
+  ~RtpParserTest() override {}
 
   void ExpectParsesPacket() {
     RtpCastHeader parsed_header;
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<TestScenario> {
   }
 
  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<Codec> {
   }
 
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     video_decoder_.reset(new VideoDecoder(cast_environment_, GetParam()));
     CHECK_EQ(STATUS_VIDEO_INITIALIZED, video_decoder_->InitializationResult());
 
diff --git a/media/cast/sender/audio_encoder_unittest.cc b/media/cast/sender/audio_encoder_unittest.cc
index 795ab72..1ac66fd 100644
--- a/media/cast/sender/audio_encoder_unittest.cc
+++ b/media/cast/sender/audio_encoder_unittest.cc
@@ -102,7 +102,7 @@ class AudioEncoderTest : public ::testing::TestWithParam<TestScenario> {
     testing_clock_->Advance(base::TimeTicks::Now() - base::TimeTicks());
   }
 
-  virtual void SetUp() {
+  void SetUp() override {
     task_runner_ = new test::FakeSingleThreadTaskRunner(testing_clock_);
     cast_environment_ =
         new CastEnvironment(scoped_ptr<base::TickClock>(testing_clock_).Pass(),
diff --git a/media/cast/sender/audio_sender_unittest.cc b/media/cast/sender/audio_sender_unittest.cc
index af8ac3f3..0045923 100644
--- a/media/cast/sender/audio_sender_unittest.cc
+++ b/media/cast/sender/audio_sender_unittest.cc
@@ -89,7 +89,7 @@ class AudioSenderTest : public ::testing::Test {
     task_runner_->RunTasks();
   }
 
-  virtual ~AudioSenderTest() {}
+  ~AudioSenderTest() override {}
 
   static void UpdateCastTransportStatus(CastTransportStatus status) {
     EXPECT_EQ(TRANSPORT_AUDIO_INITIALIZED, status);
diff --git a/media/cast/sender/external_video_encoder_unittest.cc b/media/cast/sender/external_video_encoder_unittest.cc
index 12a6b6a..db55368 100644
--- a/media/cast/sender/external_video_encoder_unittest.cc
+++ b/media/cast/sender/external_video_encoder_unittest.cc
@@ -148,7 +148,7 @@ class ExternalVideoEncoderTest : public ::testing::Test {
     vea_factory.FinishCreatingVideoEncodeAccelerator();
   }
 
-  virtual ~ExternalVideoEncoderTest() {}
+  ~ExternalVideoEncoderTest() override {}
 
   void AdvanceClockAndVideoFrameTimestamp() {
     testing_clock_->Advance(base::TimeDelta::FromMilliseconds(33));
diff --git a/media/cast/sender/video_encoder_impl_unittest.cc b/media/cast/sender/video_encoder_impl_unittest.cc
index 7c0047f..d6f5949 100644
--- a/media/cast/sender/video_encoder_impl_unittest.cc
+++ b/media/cast/sender/video_encoder_impl_unittest.cc
@@ -87,9 +87,9 @@ class VideoEncoderImplTest : public ::testing::Test {
     PopulateVideoFrame(video_frame_.get(), 123);
   }
 
-  virtual ~VideoEncoderImplTest() {}
+  ~VideoEncoderImplTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     testing_clock_ = new base::SimpleTestTickClock();
     testing_clock_->Advance(base::TimeTicks::Now() - base::TimeTicks());
     task_runner_ = new test::FakeSingleThreadTaskRunner(testing_clock_);
@@ -100,7 +100,7 @@ class VideoEncoderImplTest : public ::testing::Test {
                             task_runner_);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     video_encoder_.reset();
     task_runner_->RunTasks();
   }
diff --git a/media/cast/sender/video_sender_unittest.cc b/media/cast/sender/video_sender_unittest.cc
index 2276e33..120d8c7 100644
--- a/media/cast/sender/video_sender_unittest.cc
+++ b/media/cast/sender/video_sender_unittest.cc
@@ -155,9 +155,9 @@ class VideoSenderTest : public ::testing::Test {
         &transport_));
   }
 
-  virtual ~VideoSenderTest() {}
+  ~VideoSenderTest() override {}
 
-  virtual void TearDown() override {
+  void TearDown() override {
     video_sender_.reset();
     task_runner_->RunTasks();
   }
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc
index 7489927..3007b13 100644
--- a/media/cast/test/end2end_unittest.cc
+++ b/media/cast/test/end2end_unittest.cc
@@ -630,12 +630,12 @@ class End2EndTest : public ::testing::Test {
                                 kSoundVolume));
   }
 
-  virtual ~End2EndTest() {
+  ~End2EndTest() override {
     cast_environment_sender_->Logging()->RemoveRawEventSubscriber(
         &event_subscriber_sender_);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     cast_sender_.reset();
     cast_receiver_.reset();
     task_runner_->RunTasks();
diff --git a/media/cast/test/utility/tap_proxy.cc b/media/cast/test/utility/tap_proxy.cc
index 0546874..eac7589 100644
--- a/media/cast/test/utility/tap_proxy.cc
+++ b/media/cast/test/utility/tap_proxy.cc
@@ -41,7 +41,7 @@ class SendToFDPipe : public PacketPipe {
  public:
   explicit SendToFDPipe(int fd) : fd_(fd) {
   }
-  virtual void Send(scoped_ptr<Packet> packet) override {
+  void Send(scoped_ptr<Packet> packet) override {
     while (1) {
       int written = write(
           fd_,
@@ -85,11 +85,10 @@ class QueueManager : public base::MessageLoopForIO::Watcher {
                                  &tick_clock_);
   }
 
-  virtual ~QueueManager() {
-  }
+  ~QueueManager() override {}
 
   // MessageLoopForIO::Watcher methods
-  virtual void OnFileCanReadWithoutBlocking(int fd) override {
+  void OnFileCanReadWithoutBlocking(int fd) override {
     scoped_ptr<Packet> packet(new Packet(kMaxPacketSize));
     int nread = read(input_fd_,
                      reinterpret_cast<char*>(&packet->front()),
@@ -103,9 +102,7 @@ class QueueManager : public base::MessageLoopForIO::Watcher {
     packet->resize(nread);
     packet_pipe_->Send(packet.Pass());
   }
-  virtual void OnFileCanWriteWithoutBlocking(int fd) override {
-    NOTREACHED();
-  }
+  void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); }
 
  private:
   int input_fd_;
@@ -172,8 +169,7 @@ ByteCounter out_pipe_output_counter;
 class ByteCounterPipe : public media::cast::test::PacketPipe {
  public:
   ByteCounterPipe(ByteCounter* counter) : counter_(counter) {}
-  virtual void Send(scoped_ptr<media::cast::Packet> packet)
-      override {
+  void Send(scoped_ptr<media::cast::Packet> packet) override {
     counter_->Increment(packet->size());
     pipe_->Send(packet.Pass());
   }
diff --git a/media/ffmpeg/ffmpeg_common_unittest.cc b/media/ffmpeg/ffmpeg_common_unittest.cc
index 6b168ee..0d9bdc9 100644
--- a/media/ffmpeg/ffmpeg_common_unittest.cc
+++ b/media/ffmpeg/ffmpeg_common_unittest.cc
@@ -12,7 +12,7 @@ namespace media {
 class FFmpegCommonTest : public testing::Test {
  public:
   FFmpegCommonTest() { FFmpegGlue::InitializeFFmpeg(); }
-  virtual ~FFmpegCommonTest() {};
+  ~FFmpegCommonTest() override{};
 };
 
 TEST_F(FFmpegCommonTest, OpusAudioDecoderConfig) {
diff --git a/media/filters/audio_clock_unittest.cc b/media/filters/audio_clock_unittest.cc
index fa7248b..557fa7c 100644
--- a/media/filters/audio_clock_unittest.cc
+++ b/media/filters/audio_clock_unittest.cc
@@ -14,7 +14,7 @@ class AudioClockTest : public testing::Test {
   AudioClockTest()
       : sample_rate_(10), clock_(base::TimeDelta(), sample_rate_) {}
 
-  virtual ~AudioClockTest() {}
+  ~AudioClockTest() override {}
 
   void WroteAudio(int frames_written,
                   int frames_requested,
diff --git a/media/filters/audio_file_reader_unittest.cc b/media/filters/audio_file_reader_unittest.cc
index ba264d6..6b9bf9d 100644
--- a/media/filters/audio_file_reader_unittest.cc
+++ b/media/filters/audio_file_reader_unittest.cc
@@ -20,7 +20,7 @@ namespace media {
 class AudioFileReaderTest : public testing::Test {
  public:
   AudioFileReaderTest() : packet_verification_disabled_(false) {}
-  virtual ~AudioFileReaderTest() {}
+  ~AudioFileReaderTest() override {}
 
   void Initialize(const char* filename) {
     data_ = ReadTestDataFile(filename);
diff --git a/media/filters/audio_renderer_algorithm_unittest.cc b/media/filters/audio_renderer_algorithm_unittest.cc
index b5f895c..37584ea 100644
--- a/media/filters/audio_renderer_algorithm_unittest.cc
+++ b/media/filters/audio_renderer_algorithm_unittest.cc
@@ -75,7 +75,7 @@ class AudioRendererAlgorithmTest : public testing::Test {
         bytes_per_sample_(0) {
   }
 
-  virtual ~AudioRendererAlgorithmTest() {}
+  ~AudioRendererAlgorithmTest() override {}
 
   void Initialize() {
     Initialize(CHANNEL_LAYOUT_STEREO, kSampleFormatS16, 3000);
diff --git a/media/filters/fake_demuxer_stream_unittest.cc b/media/filters/fake_demuxer_stream_unittest.cc
index ced7496..0eb92b0 100644
--- a/media/filters/fake_demuxer_stream_unittest.cc
+++ b/media/filters/fake_demuxer_stream_unittest.cc
@@ -26,7 +26,7 @@ class FakeDemuxerStreamTest : public testing::Test {
       : status_(DemuxerStream::kAborted),
         read_pending_(false),
         num_buffers_received_(0) {}
-  virtual ~FakeDemuxerStreamTest() {}
+  ~FakeDemuxerStreamTest() override {}
 
   void BufferReady(DemuxerStream::Status status,
                    const scoped_refptr<DecoderBuffer>& buffer) {
diff --git a/media/filters/ffmpeg_glue_unittest.cc b/media/filters/ffmpeg_glue_unittest.cc
index 605b319..f9cfda5 100644
--- a/media/filters/ffmpeg_glue_unittest.cc
+++ b/media/filters/ffmpeg_glue_unittest.cc
@@ -45,7 +45,7 @@ class FFmpegGlueTest : public ::testing::Test {
     CHECK(glue_->format_context()->pb);
   }
 
-  virtual ~FFmpegGlueTest() {
+  ~FFmpegGlueTest() override {
     // Ensure |glue_| and |protocol_| are still alive.
     CHECK(glue_.get());
     CHECK(protocol_.get());
@@ -84,7 +84,7 @@ class FFmpegGlueDestructionTest : public ::testing::Test {
     CHECK(glue_->format_context()->pb);
   }
 
-  virtual ~FFmpegGlueDestructionTest() {
+  ~FFmpegGlueDestructionTest() override {
     // Ensure Initialize() was called.
     CHECK(glue_.get());
     CHECK(protocol_.get());
diff --git a/media/filters/skcanvas_video_renderer_unittest.cc b/media/filters/skcanvas_video_renderer_unittest.cc
index 4bd2a18..0ee5fc0 100644
--- a/media/filters/skcanvas_video_renderer_unittest.cc
+++ b/media/filters/skcanvas_video_renderer_unittest.cc
@@ -45,7 +45,7 @@ class SkCanvasVideoRendererTest : public testing::Test {
   };
 
   SkCanvasVideoRendererTest();
-  virtual ~SkCanvasVideoRendererTest();
+  ~SkCanvasVideoRendererTest() override;
 
   // Paints to |canvas| using |renderer_| without any frame data.
   void PaintWithoutFrame(SkCanvas* canvas);
diff --git a/media/formats/common/offset_byte_queue_unittest.cc b/media/formats/common/offset_byte_queue_unittest.cc
index b9489fe..ee5914d 100644
--- a/media/formats/common/offset_byte_queue_unittest.cc
+++ b/media/formats/common/offset_byte_queue_unittest.cc
@@ -13,7 +13,7 @@ namespace media {
 
 class OffsetByteQueueTest : public testing::Test {
  public:
-  virtual void SetUp() override {
+  void SetUp() override {
     uint8 buf[256];
     for (int i = 0; i < 256; i++) {
       buf[i] = i;
diff --git a/media/midi/midi_manager_alsa.h b/media/midi/midi_manager_alsa.h
index c59beef..cbe03c5 100644
--- a/media/midi/midi_manager_alsa.h
+++ b/media/midi/midi_manager_alsa.h
@@ -20,14 +20,14 @@ namespace media {
 class MidiManagerAlsa : public MidiManager {
  public:
   MidiManagerAlsa();
-  virtual ~MidiManagerAlsa();
+  ~MidiManagerAlsa() override;
 
   // MidiManager implementation.
-  virtual void StartInitialization() override;
-  virtual void DispatchSendMidiData(MidiManagerClient* client,
-                                    uint32 port_index,
-                                    const std::vector<uint8>& data,
-                                    double timestamp) override;
+  void StartInitialization() override;
+  void DispatchSendMidiData(MidiManagerClient* client,
+                            uint32 port_index,
+                            const std::vector<uint8>& data,
+                            double timestamp) override;
 
  private:
   // An internal callback that runs on MidiSendThread.
diff --git a/media/midi/midi_manager_unittest.cc b/media/midi/midi_manager_unittest.cc
index 8662adb..40d9152 100644
--- a/media/midi/midi_manager_unittest.cc
+++ b/media/midi/midi_manager_unittest.cc
@@ -97,7 +97,7 @@ class MidiManagerTest : public ::testing::Test {
   MidiManagerTest()
       : manager_(new FakeMidiManager),
         message_loop_(new base::MessageLoop) {}
-  virtual ~MidiManagerTest() {}
+  ~MidiManagerTest() override {}
 
  protected:
   void StartTheFirstSession(FakeMidiManagerClient* client) {
diff --git a/media/midi/midi_manager_usb_unittest.cc b/media/midi/midi_manager_usb_unittest.cc
index 5fbaa1b..4df64a6 100644
--- a/media/midi/midi_manager_usb_unittest.cc
+++ b/media/midi/midi_manager_usb_unittest.cc
@@ -159,7 +159,7 @@ class MidiManagerUsbTest : public ::testing::Test {
     factory_ = factory.get();
     manager_.reset(new MidiManagerUsbForTesting(factory.Pass()));
   }
-  virtual ~MidiManagerUsbTest() {
+  ~MidiManagerUsbTest() override {
     std::string leftover_logs = logger_.TakeLog();
     if (!leftover_logs.empty()) {
       ADD_FAILURE() << "Log should be empty: " << leftover_logs;
diff --git a/media/mojo/services/renderer_unittest.cc b/media/mojo/services/renderer_unittest.cc
index 72f74b2..a191d72 100644
--- a/media/mojo/services/renderer_unittest.cc
+++ b/media/mojo/services/renderer_unittest.cc
@@ -108,7 +108,7 @@ class MojoRendererTest : public testing::Test {
  public:
   MojoRendererTest() : service_provider_(NULL) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     demuxer_stream_provider_.reset(new FakeDemuxerStream());
     service_provider_ =
         g_test_delegate->application_impl()
diff --git a/media/tools/player_x11/data_source_logger.h b/media/tools/player_x11/data_source_logger.h
index df8840f..13fdc60 100644
--- a/media/tools/player_x11/data_source_logger.h
+++ b/media/tools/player_x11/data_source_logger.h
@@ -19,16 +19,17 @@ class DataSourceLogger : public media::DataSource {
   // |data_source|.
   DataSourceLogger(scoped_ptr<DataSource> data_source,
                    bool force_streaming);
-  virtual ~DataSourceLogger();
+  ~DataSourceLogger() override;
 
   // media::DataSource implementation.
-  virtual void Stop() override;
-  virtual void Read(
-      int64 position, int size, uint8* data,
-      const media::DataSource::ReadCB& read_cb) override;
-  virtual bool GetSize(int64* size_out) override;
-  virtual bool IsStreaming() override;
-  virtual void SetBitrate(int bitrate) override;
+  void Stop() override;
+  void Read(int64 position,
+            int size,
+            uint8* data,
+            const media::DataSource::ReadCB& read_cb) override;
+  bool GetSize(int64* size_out) override;
+  bool IsStreaming() override;
+  void SetBitrate(int bitrate) override;
 
  private:
   scoped_ptr<media::DataSource> data_source_;
diff --git a/media/video/capture/fake_video_capture_device_unittest.cc b/media/video/capture/fake_video_capture_device_unittest.cc
index 451e710..7d1fabe 100644
--- a/media/video/capture/fake_video_capture_device_unittest.cc
+++ b/media/video/capture/fake_video_capture_device_unittest.cc
@@ -83,8 +83,7 @@ class FakeVideoCaptureDeviceTest : public testing::Test {
     device_enumeration_listener_ = new DeviceEnumerationListener();
   }
 
-  virtual void SetUp() {
-  }
+  void SetUp() override {}
 
   void OnFrameCaptured(const VideoCaptureFormat& format) {
     last_format_ = format;
diff --git a/media/video/capture/linux/video_capture_device_factory_linux.h b/media/video/capture/linux/video_capture_device_factory_linux.h
index 47f8628..da570e3 100644
--- a/media/video/capture/linux/video_capture_device_factory_linux.h
+++ b/media/video/capture/linux/video_capture_device_factory_linux.h
@@ -20,12 +20,12 @@ class MEDIA_EXPORT VideoCaptureDeviceFactoryLinux
  public:
   explicit VideoCaptureDeviceFactoryLinux(
       scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
-  virtual ~VideoCaptureDeviceFactoryLinux();
+  ~VideoCaptureDeviceFactoryLinux() override;
 
-  virtual scoped_ptr<VideoCaptureDevice> Create(
+  scoped_ptr<VideoCaptureDevice> Create(
       const VideoCaptureDevice::Name& device_name) override;
-  virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) override;
-  virtual void GetDeviceSupportedFormats(
+  void GetDeviceNames(VideoCaptureDevice::Names* device_names) override;
+  void GetDeviceSupportedFormats(
       const VideoCaptureDevice::Name& device,
       VideoCaptureFormats* supported_formats) override;
 
diff --git a/media/video/capture/linux/video_capture_device_linux.h b/media/video/capture/linux/video_capture_device_linux.h
index 3efc050..c54afed 100644
--- a/media/video/capture/linux/video_capture_device_linux.h
+++ b/media/video/capture/linux/video_capture_device_linux.h
@@ -27,13 +27,13 @@ class VideoCaptureDeviceLinux : public VideoCaptureDevice {
                                      std::list<int>* fourccs);
 
   explicit VideoCaptureDeviceLinux(const Name& device_name);
-  virtual ~VideoCaptureDeviceLinux();
+  ~VideoCaptureDeviceLinux() override;
 
   // VideoCaptureDevice implementation.
-  virtual void AllocateAndStart(const VideoCaptureParams& params,
-                                scoped_ptr<Client> client) override;
+  void AllocateAndStart(const VideoCaptureParams& params,
+                        scoped_ptr<Client> client) override;
 
-  virtual void StopAndDeAllocate() override;
+  void StopAndDeAllocate() override;
 
  protected:
   void SetRotation(int rotation);
diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc
index 30cabc8..3ceab46 100644
--- a/media/video/capture/video_capture_device_unittest.cc
+++ b/media/video/capture/video_capture_device_unittest.cc
@@ -126,7 +126,7 @@ class VideoCaptureDeviceTest : public testing::Test {
     device_enumeration_listener_ = new DeviceEnumerationListener();
   }
 
-  virtual void SetUp() {
+  void SetUp() override {
 #if defined(OS_ANDROID)
     media::VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice(
         base::android::AttachCurrentThread());