Fix warnings, simplify ADM.

webrtc/modules/audio_device/include/audio_device.h

Index: webrtc/modules/audio_device/include/audio_device.h
diff --git a/webrtc/modules/audio_device/include/audio_device.h b/webrtc/modules/audio_device/include/audio_device.h
index b8b48c15e54d430ef1e6f809cca2474f77db3f70..f38a24ae8686747d1ae517adabafb4e57475df43 100644
--- a/webrtc/modules/audio_device/include/audio_device.h
+++ b/webrtc/modules/audio_device/include/audio_device.h
@@ -192,30 +192,23 @@ class AudioDeviceModule : public RefCountedModule {
   virtual int32_t GetLoudspeakerStatus(bool* enabled) const = 0;
 
   // Only supported on Android.
-  // TODO(henrika): Make pure virtual after updating Chromium.
-  virtual bool BuiltInAECIsAvailable() const { return false; }
-  virtual bool BuiltInAGCIsAvailable() const { return false; }
-  virtual bool BuiltInNSIsAvailable() const { return false; }
+  virtual bool BuiltInAECIsAvailable() const = 0;
+  virtual bool BuiltInAGCIsAvailable() const = 0;
+  virtual bool BuiltInNSIsAvailable() const = 0;
 
   // Enables the built-in audio effects. Only supported on Android.
-  // TODO(henrika): Make pure virtual after updating Chromium.
-  virtual int32_t EnableBuiltInAEC(bool enable) { return -1; }
-  virtual int32_t EnableBuiltInAGC(bool enable) { return -1; }
-  virtual int32_t EnableBuiltInNS(bool enable) { return -1; }
-  // Don't use.
-  virtual bool BuiltInAECIsEnabled() const { return false; }
-
-  // Only supported on iOS.
-  // TODO(henrika): Make pure virtual after updating Chromium.
-  virtual int GetPlayoutAudioParameters(AudioParameters* params) const {
-    return -1;
-  }
-  virtual int GetRecordAudioParameters(AudioParameters* params) const {
-    return -1;
-  }
+  virtual int32_t EnableBuiltInAEC(bool enable) = 0;
+  virtual int32_t EnableBuiltInAGC(bool enable) = 0;
+  virtual int32_t EnableBuiltInNS(bool enable) = 0;
+
+// Only supported on iOS.
+#if defined(WEBRTC_IOS)
+  virtual int GetPlayoutAudioParameters(AudioParameters* params) const = 0;
+  virtual int GetRecordAudioParameters(AudioParameters* params) const = 0;
+#endif  // WEBRTC_IOS
 
  protected:
-  virtual ~AudioDeviceModule() {}
+  ~AudioDeviceModule() override {}
 };
 
 }  // namespace webrtc