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

webrtc/modules/audio_processing/intelligibility/test/intelligibility_proc.cc

 /*
  *  Copyright (c) 2014 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.
  */
 
@@ skipping 15 matching lines @@
 #include "webrtc/common_audio/real_fourier.h"
 #include "webrtc/common_audio/wav_file.h"
 #include "webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h"
 #include "webrtc/modules/audio_processing/intelligibility/intelligibility_utils.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
 using std::complex;
 
 namespace webrtc {
+namespace {
 
-using webrtc::RealFourier;
-using webrtc::IntelligibilityEnhancer;
+bool ValidateClearWindow(const char* flagname, int32_t value) {
+  return value > 0;
+}
 
 DEFINE_int32(clear_type,
              webrtc::intelligibility::VarianceArray::kStepInfinite,
              "Variance algorithm for clear data.");
 DEFINE_double(clear_alpha, 0.9, "Variance decay factor for clear data.");
 DEFINE_int32(clear_window,
              475,
              "Window size for windowed variance for clear data.");
+const bool clear_window_dummy =
+    google::RegisterFlagValidator(&FLAGS_clear_window, &ValidateClearWindow);
 DEFINE_int32(sample_rate,
              16000,
              "Audio sample rate used in the input and output files.");
 DEFINE_int32(ana_rate,
              800,
              "Analysis rate; gains recalculated every N blocks.");
 DEFINE_int32(
     var_rate,
     2,
     "Variance clear rate; history is forgotten every N gain recalculations.");
@@ skipping 73 matching lines @@
       out_file.WriteSamples(&in_fpcm[0], samples);
     }
     system(("aplay " + temp_out_filename).c_str());
     system(("rm " + temp_out_filename).c_str());
   } else {
     WavWriter out_file(FLAGS_out_file, FLAGS_sample_rate, kNumChannels);
     out_file.WriteSamples(&in_fpcm[0], samples);
   }
 }
 
+}  // namespace
 }  // namespace webrtc
 
 int main(int argc, char* argv[]) {
   webrtc::void_main(argc, argv);
   return 0;
 }