diff --git a/modules/audio_device/include/fake_audio_device.h b/modules/audio_device/include/fake_audio_device.h
index e6f05e7b81..677f244839 100644
--- a/modules/audio_device/include/fake_audio_device.h
+++ b/modules/audio_device/include/fake_audio_device.h
@@ -19,133 +19,118 @@ class FakeAudioDeviceModule : public AudioDeviceModule {
  public:
   FakeAudioDeviceModule() {}
   virtual ~FakeAudioDeviceModule() {}
-  virtual int32_t AddRef() const { return 0; }
-  virtual int32_t Release() const { return 0; }
+  int32_t AddRef() const override { return 0; }
+  int32_t Release() const override { return 0; }
 
  private:
-  virtual int32_t RegisterAudioCallback(AudioTransport* audioCallback) {
+  int32_t RegisterAudioCallback(AudioTransport* audioCallback) override {
     return 0;
   }
-  virtual int32_t Init() { return 0; }
-  virtual int32_t InitSpeaker() { return 0; }
-  virtual int32_t SetPlayoutDevice(uint16_t index) { return 0; }
-  virtual int32_t SetPlayoutDevice(WindowsDeviceType device) { return 0; }
-  virtual int32_t SetStereoPlayout(bool enable) { return 0; }
-  virtual int32_t StopPlayout() { return 0; }
-  virtual int32_t InitMicrophone() { return 0; }
-  virtual int32_t SetRecordingDevice(uint16_t index) { return 0; }
-  virtual int32_t SetRecordingDevice(WindowsDeviceType device) { return 0; }
-  virtual int32_t SetStereoRecording(bool enable) { return 0; }
-  virtual int32_t SetAGC(bool enable) { return 0; }
-  virtual int32_t StopRecording() { return 0; }
+  int32_t Init() override { return 0; }
+  int32_t InitSpeaker() override { return 0; }
+  int32_t SetPlayoutDevice(uint16_t index) override { return 0; }
+  int32_t SetPlayoutDevice(WindowsDeviceType device) override { return 0; }
+  int32_t SetStereoPlayout(bool enable) override { return 0; }
+  int32_t StopPlayout() override { return 0; }
+  int32_t InitMicrophone() override { return 0; }
+  int32_t SetRecordingDevice(uint16_t index) override { return 0; }
+  int32_t SetRecordingDevice(WindowsDeviceType device) override { return 0; }
+  int32_t SetStereoRecording(bool enable) override { return 0; }
+  int32_t SetAGC(bool enable) override { return 0; }
+  int32_t StopRecording() override { return 0; }
 
-  // If the subclass doesn't override the ProcessThread implementation,
-  // we'll fall back on an implementation that doesn't eat too much CPU.
-  virtual int64_t TimeUntilNextProcess() {
-    if (turn_off_module_callbacks_)
-      return 7 * 24 * 60 * 60 * 1000;  // call me next week.
-    uses_default_module_implementation_ = true;
-    return 10;
-  }
+  int32_t Terminate() override { return 0; }
 
-  virtual void Process() {
-    turn_off_module_callbacks_ = uses_default_module_implementation_;
-  }
-
-  virtual int32_t Terminate() { return 0; }
-
-  virtual int32_t ActiveAudioLayer(AudioLayer* audioLayer) const { return 0; }
-  virtual ErrorCode LastError() const { return kAdmErrNone; }
-  virtual bool Initialized() const { return true; }
-  virtual int16_t PlayoutDevices() { return 0; }
-  virtual int16_t RecordingDevices() { return 0; }
-  virtual int32_t PlayoutDeviceName(uint16_t index,
+  int32_t ActiveAudioLayer(AudioLayer* audioLayer) const override { return 0; }
+  ErrorCode LastError() const override { return kAdmErrNone; }
+  bool Initialized() const override { return true; }
+  int16_t PlayoutDevices() override { return 0; }
+  int16_t RecordingDevices() override { return 0; }
+  int32_t PlayoutDeviceName(uint16_t index,
                             char name[kAdmMaxDeviceNameSize],
-                            char guid[kAdmMaxGuidSize]) {
+                            char guid[kAdmMaxGuidSize]) override {
     return 0;
   }
-  virtual int32_t RecordingDeviceName(uint16_t index,
+  int32_t RecordingDeviceName(uint16_t index,
                               char name[kAdmMaxDeviceNameSize],
-                              char guid[kAdmMaxGuidSize]) {
+                              char guid[kAdmMaxGuidSize]) override {
     return 0;
   }
-  virtual int32_t PlayoutIsAvailable(bool* available) { return 0; }
-  virtual int32_t InitPlayout() { return 0; }
-  virtual bool PlayoutIsInitialized() const { return true; }
-  virtual int32_t RecordingIsAvailable(bool* available) { return 0; }
-  virtual int32_t InitRecording() { return 0; }
-  virtual bool RecordingIsInitialized() const { return true; }
-  virtual int32_t StartPlayout() { return 0; }
-  virtual bool Playing() const { return false; }
-  virtual int32_t StartRecording() { return 0; }
-  virtual bool Recording() const { return false; }
-  virtual bool AGC() const { return true; }
-  virtual bool SpeakerIsInitialized() const { return true; }
-  virtual bool MicrophoneIsInitialized() const { return true; }
-  virtual int32_t SpeakerVolumeIsAvailable(bool* available) { return 0; }
-  virtual int32_t SetSpeakerVolume(uint32_t volume) { return 0; }
-  virtual int32_t SpeakerVolume(uint32_t* volume) const { return 0; }
-  virtual int32_t MaxSpeakerVolume(uint32_t* maxVolume) const { return 0; }
-  virtual int32_t MinSpeakerVolume(uint32_t* minVolume) const { return 0; }
-  virtual int32_t MicrophoneVolumeIsAvailable(bool* available) { return 0; }
-  virtual int32_t SetMicrophoneVolume(uint32_t volume) { return 0; }
-  virtual int32_t MicrophoneVolume(uint32_t* volume) const { return 0; }
-  virtual int32_t MaxMicrophoneVolume(uint32_t* maxVolume) const { return 0; }
-  virtual int32_t MinMicrophoneVolume(uint32_t* minVolume) const { return 0; }
-  virtual int32_t SpeakerMuteIsAvailable(bool* available) { return 0; }
-  virtual int32_t SetSpeakerMute(bool enable) { return 0; }
-  virtual int32_t SpeakerMute(bool* enabled) const { return 0; }
-  virtual int32_t MicrophoneMuteIsAvailable(bool* available) { return 0; }
-  virtual int32_t SetMicrophoneMute(bool enable) { return 0; }
-  virtual int32_t MicrophoneMute(bool* enabled) const { return 0; }
-  virtual int32_t StereoPlayoutIsAvailable(bool* available) const {
+  int32_t PlayoutIsAvailable(bool* available) override { return 0; }
+  int32_t InitPlayout() override { return 0; }
+  bool PlayoutIsInitialized() const override { return true; }
+  int32_t RecordingIsAvailable(bool* available) override { return 0; }
+  int32_t InitRecording() override { return 0; }
+  bool RecordingIsInitialized() const override { return true; }
+  int32_t StartPlayout() override { return 0; }
+  bool Playing() const override { return false; }
+  int32_t StartRecording() override { return 0; }
+  bool Recording() const override { return false; }
+  bool AGC() const override { return true; }
+  bool SpeakerIsInitialized() const override { return true; }
+  bool MicrophoneIsInitialized() const override { return true; }
+  int32_t SpeakerVolumeIsAvailable(bool* available) override { return 0; }
+  int32_t SetSpeakerVolume(uint32_t volume) override { return 0; }
+  int32_t SpeakerVolume(uint32_t* volume) const override { return 0; }
+  int32_t MaxSpeakerVolume(uint32_t* maxVolume) const override { return 0; }
+  int32_t MinSpeakerVolume(uint32_t* minVolume) const override { return 0; }
+  int32_t MicrophoneVolumeIsAvailable(bool* available) override { return 0; }
+  int32_t SetMicrophoneVolume(uint32_t volume) override { return 0; }
+  int32_t MicrophoneVolume(uint32_t* volume) const override { return 0; }
+  int32_t MaxMicrophoneVolume(uint32_t* maxVolume) const override { return 0; }
+  int32_t MinMicrophoneVolume(uint32_t* minVolume) const override { return 0; }
+  int32_t SpeakerMuteIsAvailable(bool* available) override { return 0; }
+  int32_t SetSpeakerMute(bool enable) override { return 0; }
+  int32_t SpeakerMute(bool* enabled) const override { return 0; }
+  int32_t MicrophoneMuteIsAvailable(bool* available) override { return 0; }
+  int32_t SetMicrophoneMute(bool enable) override { return 0; }
+  int32_t MicrophoneMute(bool* enabled) const override { return 0; }
+  int32_t StereoPlayoutIsAvailable(bool* available) const override {
     *available = false;
     return 0;
   }
-  virtual int32_t StereoPlayout(bool* enabled) const { return 0; }
-  virtual int32_t StereoRecordingIsAvailable(bool* available) const {
+  int32_t StereoPlayout(bool* enabled) const override { return 0; }
+  int32_t StereoRecordingIsAvailable(bool* available) const override {
     *available = false;
     return 0;
   }
-  virtual int32_t StereoRecording(bool* enabled) const { return 0; }
-  virtual int32_t SetRecordingChannel(const ChannelType channel) { return 0; }
-  virtual int32_t RecordingChannel(ChannelType* channel) const { return 0; }
-  virtual int32_t PlayoutDelay(uint16_t* delayMS) const {
+  int32_t StereoRecording(bool* enabled) const override { return 0; }
+  int32_t SetRecordingChannel(const ChannelType channel) override { return 0; }
+  int32_t RecordingChannel(ChannelType* channel) const override { return 0; }
+  int32_t PlayoutDelay(uint16_t* delayMS) const override {
     *delayMS = 0;
     return 0;
   }
-  virtual int32_t RecordingDelay(uint16_t* delayMS) const { return 0; }
-  virtual int32_t SetRecordingSampleRate(const uint32_t samplesPerSec) {
+  int32_t RecordingDelay(uint16_t* delayMS) const override { return 0; }
+  int32_t SetRecordingSampleRate(const uint32_t samplesPerSec) override {
     return 0;
   }
-  virtual int32_t RecordingSampleRate(uint32_t* samplesPerSec) const {
+  int32_t RecordingSampleRate(uint32_t* samplesPerSec) const override {
     return 0;
   }
-  virtual int32_t SetPlayoutSampleRate(const uint32_t samplesPerSec) {
+  int32_t SetPlayoutSampleRate(const uint32_t samplesPerSec) override {
     return 0;
   }
-  virtual int32_t PlayoutSampleRate(uint32_t* samplesPerSec) const { return 0; }
-  virtual int32_t SetLoudspeakerStatus(bool enable) { return 0; }
-  virtual int32_t GetLoudspeakerStatus(bool* enabled) const { return 0; }
-  virtual bool BuiltInAECIsAvailable() const { return false; }
-  virtual int32_t EnableBuiltInAEC(bool enable) { return -1; }
-  virtual bool BuiltInAGCIsAvailable() const { return false; }
-  virtual int32_t EnableBuiltInAGC(bool enable) { return -1; }
-  virtual bool BuiltInNSIsAvailable() const { return false; }
-  virtual int32_t EnableBuiltInNS(bool enable) { return -1; }
+  int32_t PlayoutSampleRate(uint32_t* samplesPerSec) const override {
+    return 0;
+  }
+  int32_t SetLoudspeakerStatus(bool enable) override { return 0; }
+  int32_t GetLoudspeakerStatus(bool* enabled) const override { return 0; }
+  bool BuiltInAECIsAvailable() const override { return false; }
+  int32_t EnableBuiltInAEC(bool enable) override { return -1; }
+  bool BuiltInAGCIsAvailable() const override { return false; }
+  int32_t EnableBuiltInAGC(bool enable) override { return -1; }
+  bool BuiltInNSIsAvailable() const override { return false; }
+  int32_t EnableBuiltInNS(bool enable) override { return -1; }
 
 #if defined(WEBRTC_IOS)
-  virtual int GetPlayoutAudioParameters(AudioParameters* params) const {
+  int GetPlayoutAudioParameters(AudioParameters* params) const override {
     return -1;
   }
-  virtual int GetRecordAudioParameters(AudioParameters* params) const {
+  int GetRecordAudioParameters(AudioParameters* params) const override {
     return -1;
   }
 #endif  // WEBRTC_IOS
-
- private:
-  bool uses_default_module_implementation_ = false;
-  bool turn_off_module_callbacks_ = false;
 };
 
 }  // namespace webrtc