Remove AudioDeviceObserver and make ADM not inherit from the Module interface.

modules/audio_device/include/audio_device.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_
 #define MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_
 
 #include "modules/audio_device/include/audio_device_defines.h"
 #include "modules/include/module.h"
 #include "rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/refcount.h"
 
 namespace webrtc {
 
-class AudioDeviceModule : public RefCountedModule {
+class AudioDeviceModule : public rtc::RefCountInterface {

[henrika_webrtc, 2017/09/25 10:42:57]

Me like ;-)

  public:
   enum ErrorCode {
     kAdmErrNone = 0,
     kAdmErrArgument = 1
   };
 
   enum AudioLayer {
     kPlatformDefaultAudio = 0,
     kWindowsCoreAudio = 2,
     kLinuxAlsaAudio = 3,
@@ skipping 19 matching lines @@
   // Create an ADM.
   static rtc::scoped_refptr<AudioDeviceModule> Create(
       const int32_t id,
       const AudioLayer audio_layer);
 
   // Retrieve the currently utilized audio layer
   virtual int32_t ActiveAudioLayer(AudioLayer* audioLayer) const = 0;
 
   // Error handling
   virtual ErrorCode LastError() const = 0;
-  virtual int32_t RegisterEventObserver(AudioDeviceObserver* eventCallback) = 0;
 
   // Full-duplex transportation of PCM audio
   virtual int32_t RegisterAudioCallback(AudioTransport* audioCallback) = 0;
 
   // Main initialization and termination
   virtual int32_t Init() = 0;
   virtual int32_t Terminate() = 0;
   virtual bool Initialized() const = 0;
 
   // Device enumeration
@@ skipping 102 matching lines @@
   virtual int GetRecordAudioParameters(AudioParameters* params) const = 0;
 #endif  // WEBRTC_IOS
 
  protected:
   ~AudioDeviceModule() override {}
 };
 
 }  // namespace webrtc
 
 #endif  // MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_