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

webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc

Index: webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc
diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc
index 3029e21619a981917f377afb78075bfd66def952..94d5c88ea3c1baf89e6385d78936fb2bcc3c006d 100644
--- a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc
+++ b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc
@@ -33,7 +33,6 @@ using std::min;
 
 namespace webrtc {
 
-const int IntelligibilityEnhancer::kErbResolution = 2;
 const int IntelligibilityEnhancer::kWindowSizeMs = 2;
 const int IntelligibilityEnhancer::kChunkSizeMs = 10;  // Size provided by APM.
 const int IntelligibilityEnhancer::kAnalyzeRate = 800;
@@ -134,7 +133,7 @@ IntelligibilityEnhancer::IntelligibilityEnhancer(int erb_resolution,
   float freqs_khz = kClipFreq / 1000.0f;
   int erb_index = static_cast<int>(ceilf(
       11.17f * logf((freqs_khz + 0.312f) / (freqs_khz + 14.6575f)) + 43.0f));
-  start_freq_ = max(1, erb_index * kErbResolution);
+  start_freq_ = std::max(1, erb_index * erb_resolution);

[Peter Kasting, 2015/07/10 18:48:46]

It seemed strange to use the passed-in resolution most places but hardcode a
file-scope constant here.  Besides this, the caller actually passes the same
value (2) for the resolution anyway, so this won't actually have a practical
effect.

 
   WindowGenerator::KaiserBesselDerived(kKbdAlpha, window_size_,
                                        kbd_window_.get());