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

webrtc/modules/audio_coding/main/test/PCMFile.cc

 /*
  *  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.
  */
 
@@ skipping 132 matching lines @@
 void PCMFile::Write10MsData(AudioFrame& audio_frame) {
   if (audio_frame.num_channels_ == 1) {
     if (!save_stereo_) {
       if (fwrite(audio_frame.data_, sizeof(uint16_t),
                  audio_frame.samples_per_channel_, pcm_file_) !=
           static_cast<size_t>(audio_frame.samples_per_channel_)) {
         return;
       }
     } else {
       int16_t* stereo_audio = new int16_t[2 * audio_frame.samples_per_channel_];
-      int k;
-      for (k = 0; k < audio_frame.samples_per_channel_; k++) {
+      for (int k = 0; k < audio_frame.samples_per_channel_; k++) {
         stereo_audio[k << 1] = audio_frame.data_[k];
         stereo_audio[(k << 1) + 1] = audio_frame.data_[k];
       }
       if (fwrite(stereo_audio, sizeof(int16_t),
                  2 * audio_frame.samples_per_channel_, pcm_file_) !=
           static_cast<size_t>(2 * audio_frame.samples_per_channel_)) {
         return;
       }
       delete[] stereo_audio;
     }
@@ skipping 31 matching lines @@
 
 void PCMFile::SaveStereo(bool is_stereo) {
   save_stereo_ = is_stereo;
 }
 
 void PCMFile::ReadStereo(bool is_stereo) {
   read_stereo_ = is_stereo;
 }
 
 }  // namespace webrtc