Mark all virtual overrides in the hierarchy of Module as virtual and OVERRIDE.

This will make a subsequent change I intend to do safer, where I'll change the
return type of one of the base Module functions, by breaking the compile if I
miss any overrides.

This also highlighted a number of unused functions (in many cases apparently
virtual "overrides" of no-longer-existent base functions).  I've removed some of
these.

This also highlighted several cases where "virtual" was used unnecessarily to
mark a function that was only defined in one class.  Removed "virtual" in those
cases.

BUG=none
TEST=none
R=andrew@webrtc.org, henrik.lundin@webrtc.org, mallinath@webrtc.org, mflodman@webrtc.org, stefan@webrtc.org, turaj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/24419004

git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7146 4adac7df-926f-26a2-2b94-8c16560cd09d

3 files changed, 108 insertions, 138 deletions

diff --git a/app/webrtc/test/fakeaudiocapturemodule.cc b/app/webrtc/test/fakeaudiocapturemodule.cc
index ff45f14..2ad3f0f 100644
--- a/app/webrtc/test/fakeaudiocapturemodule.cc
+++ b/app/webrtc/test/fakeaudiocapturemodule.cc
@@ -94,13 +94,6 @@ int FakeAudioCaptureModule::frames_received() const {
   return frames_received_;
 }
 
-int32_t FakeAudioCaptureModule::Version(char* /*version*/,
-                                        uint32_t& /*remaining_buffer_in_bytes*/,
-                                        uint32_t& /*position*/) const {
-  ASSERT(false);
-  return 0;
-}
-
 int32_t FakeAudioCaptureModule::TimeUntilNextProcess() {
   const uint32 current_time = rtc::Time();
   if (current_time < last_process_time_ms_) {
@@ -325,12 +318,6 @@ int32_t FakeAudioCaptureModule::WaveOutVolume(
   return 0;
 }
 
-int32_t FakeAudioCaptureModule::SpeakerIsAvailable(bool* available) {
-  // No speaker, just dropping audio. Return success.
-  *available = true;
-  return 0;
-}
-
 int32_t FakeAudioCaptureModule::InitSpeaker() {
   // No speaker, just playing from file. Return success.
   return 0;
@@ -341,12 +328,6 @@ bool FakeAudioCaptureModule::SpeakerIsInitialized() const {
   return 0;
 }
 
-int32_t FakeAudioCaptureModule::MicrophoneIsAvailable(bool* available) {
-  // No microphone, just playing from file. Return success.
-  *available = true;
-  return 0;
-}
-
 int32_t FakeAudioCaptureModule::InitMicrophone() {
   // No microphone, just playing from file. Return success.
   return 0;
diff --git a/app/webrtc/test/fakeaudiocapturemodule.h b/app/webrtc/test/fakeaudiocapturemodule.h
index aec3e5e..79b72b6 100644
--- a/app/webrtc/test/fakeaudiocapturemodule.h
+++ b/app/webrtc/test/fakeaudiocapturemodule.h
@@ -76,133 +76,132 @@ class FakeAudioCaptureModule
   // Only functions called by PeerConnection are implemented, the rest do
   // nothing and return success. If a function is not expected to be called by
   // PeerConnection an assertion is triggered if it is in fact called.
-  virtual int32_t Version(char* version,
-                          uint32_t& remaining_buffer_in_bytes,
-                          uint32_t& position) const;
-  virtual int32_t TimeUntilNextProcess();
-  virtual int32_t Process();
-  virtual int32_t ChangeUniqueId(const int32_t id);
+  virtual int32_t TimeUntilNextProcess() OVERRIDE;
+  virtual int32_t Process() OVERRIDE;
+  virtual int32_t ChangeUniqueId(const int32_t id) OVERRIDE;
 
-  virtual int32_t ActiveAudioLayer(AudioLayer* audio_layer) const;
+  virtual int32_t ActiveAudioLayer(AudioLayer* audio_layer) const OVERRIDE;
 
-  virtual ErrorCode LastError() const;
+  virtual ErrorCode LastError() const OVERRIDE;
   virtual int32_t RegisterEventObserver(
-      webrtc::AudioDeviceObserver* event_callback);
+      webrtc::AudioDeviceObserver* event_callback) OVERRIDE;
 
   // Note: Calling this method from a callback may result in deadlock.
-  virtual int32_t RegisterAudioCallback(webrtc::AudioTransport* audio_callback);
-
-  virtual int32_t Init();
-  virtual int32_t Terminate();
-  virtual bool Initialized() const;
-
-  virtual int16_t PlayoutDevices();
-  virtual int16_t RecordingDevices();
-  virtual int32_t PlayoutDeviceName(uint16_t index,
-                                    char name[webrtc::kAdmMaxDeviceNameSize],
-                                    char guid[webrtc::kAdmMaxGuidSize]);
-  virtual int32_t RecordingDeviceName(uint16_t index,
-                                      char name[webrtc::kAdmMaxDeviceNameSize],
-                                      char guid[webrtc::kAdmMaxGuidSize]);
-
-  virtual int32_t SetPlayoutDevice(uint16_t index);
-  virtual int32_t SetPlayoutDevice(WindowsDeviceType device);
-  virtual int32_t SetRecordingDevice(uint16_t index);
-  virtual int32_t SetRecordingDevice(WindowsDeviceType device);
-
-  virtual int32_t PlayoutIsAvailable(bool* available);
-  virtual int32_t InitPlayout();
-  virtual bool PlayoutIsInitialized() const;
-  virtual int32_t RecordingIsAvailable(bool* available);
-  virtual int32_t InitRecording();
-  virtual bool RecordingIsInitialized() const;
-
-  virtual int32_t StartPlayout();
-  virtual int32_t StopPlayout();
-  virtual bool Playing() const;
-  virtual int32_t StartRecording();
-  virtual int32_t StopRecording();
-  virtual bool Recording() const;
-
-  virtual int32_t SetAGC(bool enable);
-  virtual bool AGC() const;
+  virtual int32_t RegisterAudioCallback(
+      webrtc::AudioTransport* audio_callback) OVERRIDE;
+
+  virtual int32_t Init() OVERRIDE;
+  virtual int32_t Terminate() OVERRIDE;
+  virtual bool Initialized() const OVERRIDE;
+
+  virtual int16_t PlayoutDevices() OVERRIDE;
+  virtual int16_t RecordingDevices() OVERRIDE;
+  virtual int32_t PlayoutDeviceName(
+      uint16_t index,
+      char name[webrtc::kAdmMaxDeviceNameSize],
+      char guid[webrtc::kAdmMaxGuidSize]) OVERRIDE;
+  virtual int32_t RecordingDeviceName(
+      uint16_t index,
+      char name[webrtc::kAdmMaxDeviceNameSize],
+      char guid[webrtc::kAdmMaxGuidSize]) OVERRIDE;
+
+  virtual int32_t SetPlayoutDevice(uint16_t index) OVERRIDE;
+  virtual int32_t SetPlayoutDevice(WindowsDeviceType device) OVERRIDE;
+  virtual int32_t SetRecordingDevice(uint16_t index) OVERRIDE;
+  virtual int32_t SetRecordingDevice(WindowsDeviceType device) OVERRIDE;
+
+  virtual int32_t PlayoutIsAvailable(bool* available) OVERRIDE;
+  virtual int32_t InitPlayout() OVERRIDE;
+  virtual bool PlayoutIsInitialized() const OVERRIDE;
+  virtual int32_t RecordingIsAvailable(bool* available) OVERRIDE;
+  virtual int32_t InitRecording() OVERRIDE;
+  virtual bool RecordingIsInitialized() const OVERRIDE;
+
+  virtual int32_t StartPlayout() OVERRIDE;
+  virtual int32_t StopPlayout() OVERRIDE;
+  virtual bool Playing() const OVERRIDE;
+  virtual int32_t StartRecording() OVERRIDE;
+  virtual int32_t StopRecording() OVERRIDE;
+  virtual bool Recording() const OVERRIDE;
+
+  virtual int32_t SetAGC(bool enable) OVERRIDE;
+  virtual bool AGC() const OVERRIDE;
 
   virtual int32_t SetWaveOutVolume(uint16_t volume_left,
-                                   uint16_t volume_right);
+                                   uint16_t volume_right) OVERRIDE;
   virtual int32_t WaveOutVolume(uint16_t* volume_left,
-                                uint16_t* volume_right) const;
-
-  virtual int32_t SpeakerIsAvailable(bool* available);
-  virtual int32_t InitSpeaker();
-  virtual bool SpeakerIsInitialized() const;
-  virtual int32_t MicrophoneIsAvailable(bool* available);
-  virtual int32_t InitMicrophone();
-  virtual bool MicrophoneIsInitialized() const;
-
-  virtual int32_t SpeakerVolumeIsAvailable(bool* available);
-  virtual int32_t SetSpeakerVolume(uint32_t volume);
-  virtual int32_t SpeakerVolume(uint32_t* volume) const;
-  virtual int32_t MaxSpeakerVolume(uint32_t* max_volume) const;
-  virtual int32_t MinSpeakerVolume(uint32_t* min_volume) const;
-  virtual int32_t SpeakerVolumeStepSize(uint16_t* step_size) const;
-
-  virtual int32_t MicrophoneVolumeIsAvailable(bool* available);
-  virtual int32_t SetMicrophoneVolume(uint32_t volume);
-  virtual int32_t MicrophoneVolume(uint32_t* volume) const;
-  virtual int32_t MaxMicrophoneVolume(uint32_t* max_volume) const;
-
-  virtual int32_t MinMicrophoneVolume(uint32_t* min_volume) const;
-  virtual int32_t MicrophoneVolumeStepSize(uint16_t* step_size) const;
-
-  virtual int32_t SpeakerMuteIsAvailable(bool* available);
-  virtual int32_t SetSpeakerMute(bool enable);
-  virtual int32_t SpeakerMute(bool* enabled) const;
-
-  virtual int32_t MicrophoneMuteIsAvailable(bool* available);
-  virtual int32_t SetMicrophoneMute(bool enable);
-  virtual int32_t MicrophoneMute(bool* enabled) const;
-
-  virtual int32_t MicrophoneBoostIsAvailable(bool* available);
-  virtual int32_t SetMicrophoneBoost(bool enable);
-  virtual int32_t MicrophoneBoost(bool* enabled) const;
-
-  virtual int32_t StereoPlayoutIsAvailable(bool* available) const;
-  virtual int32_t SetStereoPlayout(bool enable);
-  virtual int32_t StereoPlayout(bool* enabled) const;
-  virtual int32_t StereoRecordingIsAvailable(bool* available) const;
-  virtual int32_t SetStereoRecording(bool enable);
-  virtual int32_t StereoRecording(bool* enabled) const;
-  virtual int32_t SetRecordingChannel(const ChannelType channel);
-  virtual int32_t RecordingChannel(ChannelType* channel) const;
+                                uint16_t* volume_right) const OVERRIDE;
+
+  virtual int32_t InitSpeaker() OVERRIDE;
+  virtual bool SpeakerIsInitialized() const OVERRIDE;
+  virtual int32_t InitMicrophone() OVERRIDE;
+  virtual bool MicrophoneIsInitialized() const OVERRIDE;
+
+  virtual int32_t SpeakerVolumeIsAvailable(bool* available) OVERRIDE;
+  virtual int32_t SetSpeakerVolume(uint32_t volume) OVERRIDE;
+  virtual int32_t SpeakerVolume(uint32_t* volume) const OVERRIDE;
+  virtual int32_t MaxSpeakerVolume(uint32_t* max_volume) const OVERRIDE;
+  virtual int32_t MinSpeakerVolume(uint32_t* min_volume) const OVERRIDE;
+  virtual int32_t SpeakerVolumeStepSize(uint16_t* step_size) const OVERRIDE;
+
+  virtual int32_t MicrophoneVolumeIsAvailable(bool* available) OVERRIDE;
+  virtual int32_t SetMicrophoneVolume(uint32_t volume) OVERRIDE;
+  virtual int32_t MicrophoneVolume(uint32_t* volume) const OVERRIDE;
+  virtual int32_t MaxMicrophoneVolume(uint32_t* max_volume) const OVERRIDE;
+
+  virtual int32_t MinMicrophoneVolume(uint32_t* min_volume) const OVERRIDE;
+  virtual int32_t MicrophoneVolumeStepSize(uint16_t* step_size) const OVERRIDE;
+
+  virtual int32_t SpeakerMuteIsAvailable(bool* available) OVERRIDE;
+  virtual int32_t SetSpeakerMute(bool enable) OVERRIDE;
+  virtual int32_t SpeakerMute(bool* enabled) const OVERRIDE;
+
+  virtual int32_t MicrophoneMuteIsAvailable(bool* available) OVERRIDE;
+  virtual int32_t SetMicrophoneMute(bool enable) OVERRIDE;
+  virtual int32_t MicrophoneMute(bool* enabled) const OVERRIDE;
+
+  virtual int32_t MicrophoneBoostIsAvailable(bool* available) OVERRIDE;
+  virtual int32_t SetMicrophoneBoost(bool enable) OVERRIDE;
+  virtual int32_t MicrophoneBoost(bool* enabled) const OVERRIDE;
+
+  virtual int32_t StereoPlayoutIsAvailable(bool* available) const OVERRIDE;
+  virtual int32_t SetStereoPlayout(bool enable) OVERRIDE;
+  virtual int32_t StereoPlayout(bool* enabled) const OVERRIDE;
+  virtual int32_t StereoRecordingIsAvailable(bool* available) const OVERRIDE;
+  virtual int32_t SetStereoRecording(bool enable) OVERRIDE;
+  virtual int32_t StereoRecording(bool* enabled) const OVERRIDE;
+  virtual int32_t SetRecordingChannel(const ChannelType channel) OVERRIDE;
+  virtual int32_t RecordingChannel(ChannelType* channel) const OVERRIDE;
 
   virtual int32_t SetPlayoutBuffer(const BufferType type,
-                                   uint16_t size_ms = 0);
+                                   uint16_t size_ms = 0) OVERRIDE;
   virtual int32_t PlayoutBuffer(BufferType* type,
-                                uint16_t* size_ms) const;
-  virtual int32_t PlayoutDelay(uint16_t* delay_ms) const;
-  virtual int32_t RecordingDelay(uint16_t* delay_ms) const;
+                                uint16_t* size_ms) const OVERRIDE;
+  virtual int32_t PlayoutDelay(uint16_t* delay_ms) const OVERRIDE;
+  virtual int32_t RecordingDelay(uint16_t* delay_ms) const OVERRIDE;
 
-  virtual int32_t CPULoad(uint16_t* load) const;
+  virtual int32_t CPULoad(uint16_t* load) const OVERRIDE;
 
   virtual int32_t StartRawOutputFileRecording(
-      const char pcm_file_name_utf8[webrtc::kAdmMaxFileNameSize]);
-  virtual int32_t StopRawOutputFileRecording();
+      const char pcm_file_name_utf8[webrtc::kAdmMaxFileNameSize]) OVERRIDE;
+  virtual int32_t StopRawOutputFileRecording() OVERRIDE;
   virtual int32_t StartRawInputFileRecording(
-      const char pcm_file_name_utf8[webrtc::kAdmMaxFileNameSize]);
-  virtual int32_t StopRawInputFileRecording();
-
-  virtual int32_t SetRecordingSampleRate(const uint32_t samples_per_sec);
-  virtual int32_t RecordingSampleRate(uint32_t* samples_per_sec) const;
-  virtual int32_t SetPlayoutSampleRate(const uint32_t samples_per_sec);
-  virtual int32_t PlayoutSampleRate(uint32_t* samples_per_sec) const;
-
-  virtual int32_t ResetAudioDevice();
-  virtual int32_t SetLoudspeakerStatus(bool enable);
-  virtual int32_t GetLoudspeakerStatus(bool* enabled) const;
+      const char pcm_file_name_utf8[webrtc::kAdmMaxFileNameSize]) OVERRIDE;
+  virtual int32_t StopRawInputFileRecording() OVERRIDE;
+
+  virtual int32_t SetRecordingSampleRate(
+      const uint32_t samples_per_sec) OVERRIDE;
+  virtual int32_t RecordingSampleRate(uint32_t* samples_per_sec) const OVERRIDE;
+  virtual int32_t SetPlayoutSampleRate(const uint32_t samples_per_sec) OVERRIDE;
+  virtual int32_t PlayoutSampleRate(uint32_t* samples_per_sec) const OVERRIDE;
+
+  virtual int32_t ResetAudioDevice() OVERRIDE;
+  virtual int32_t SetLoudspeakerStatus(bool enable) OVERRIDE;
+  virtual int32_t GetLoudspeakerStatus(bool* enabled) const OVERRIDE;
   // End of functions inherited from webrtc::AudioDeviceModule.
 
   // The following function is inherited from rtc::MessageHandler.
-  virtual void OnMessage(rtc::Message* msg);
+  virtual void OnMessage(rtc::Message* msg) OVERRIDE;
 
  protected:
   // The constructor is protected because the class needs to be created as a
diff --git a/app/webrtc/test/fakeaudiocapturemodule_unittest.cc b/app/webrtc/test/fakeaudiocapturemodule_unittest.cc
index 9e63c1c..ddacc38 100644
--- a/app/webrtc/test/fakeaudiocapturemodule_unittest.cc
+++ b/app/webrtc/test/fakeaudiocapturemodule_unittest.cc
@@ -145,11 +145,6 @@ TEST_F(FakeAdmTest, TestProccess) {
 TEST_F(FakeAdmTest, PlayoutTest) {
   EXPECT_EQ(0, fake_audio_capture_module_->RegisterAudioCallback(this));
 
-  bool speaker_available = false;
-  EXPECT_EQ(0, fake_audio_capture_module_->SpeakerIsAvailable(
-      &speaker_available));
-  EXPECT_TRUE(speaker_available);
-
   bool stereo_available = false;
   EXPECT_EQ(0,
             fake_audio_capture_module_->StereoPlayoutIsAvailable(
@@ -182,11 +177,6 @@ TEST_F(FakeAdmTest, PlayoutTest) {
 TEST_F(FakeAdmTest, RecordTest) {
   EXPECT_EQ(0, fake_audio_capture_module_->RegisterAudioCallback(this));
 
-  bool microphone_available = false;
-  EXPECT_EQ(0, fake_audio_capture_module_->MicrophoneIsAvailable(
-      &microphone_available));
-  EXPECT_TRUE(microphone_available);
-
   bool stereo_available = false;
   EXPECT_EQ(0, fake_audio_capture_module_->StereoRecordingIsAvailable(
       &stereo_available));