Miscellaneous changes split from https://codereview.webrtc.org/1230503003 .

webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h

Index: webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h
diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h
index 8125707f120981c40817152a80bcbea43f2e3006..9e4a9d146296ad80b76f749b8fdb52b0aa68131e 100644
--- a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h
+++ b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h
@@ -72,11 +72,11 @@ class IntelligibilityEnhancer {
 
     // All in frequency domain, receives input |in_block|, applies
     // intelligibility enhancement, and writes result to |out_block|.
-    virtual void ProcessAudioBlock(const std::complex<float>* const* in_block,
-                                   int in_channels,
-                                   int frames,
-                                   int out_channels,
-                                   std::complex<float>* const* out_block);
+    void ProcessAudioBlock(const std::complex<float>* const* in_block,
+                           int in_channels,
+                           int frames,
+                           int out_channels,
+                           std::complex<float>* const* out_block) override;
 
    private:
     IntelligibilityEnhancer* parent_;
@@ -118,7 +118,6 @@ class IntelligibilityEnhancer {
   // Returns dot product of vectors specified by size |length| arrays |a|,|b|.
   static float DotProduct(const float* a, const float* b, int length);
 
-  static const int kErbResolution;
   static const int kWindowSizeMs;
   static const int kChunkSizeMs;
   static const int kAnalyzeRate;   // Default for |analysis_rate_|.