Cleaned up and revised the handling of resampling and bandsplitting in APM and

webrtc/modules/audio_processing/audio_processing_impl_unittest.cc

Index: webrtc/modules/audio_processing/audio_processing_impl_unittest.cc
diff --git a/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc b/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc
index 54e0331492ce708e905d82abbb1ff2525a5f7322..cdb42a00386b4c2b39dcd6de169943bf06cbcd7a 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc
@@ -42,11 +42,11 @@ TEST(AudioProcessingImplTest, AudioParameterChangeTriggersInit) {
   mock.Initialize();
 
   AudioFrame frame;
-  // Call with the default parameters; there should be no init.
+  // Call with the default parameters; there should be an init.
   frame.num_channels_ = 1;
   SetFrameSampleRate(&frame, 16000);
   EXPECT_CALL(mock, InitializeLocked())
-      .Times(0);
+      .Times(1);
   EXPECT_NOERR(mock.ProcessStream(&frame));
   EXPECT_NOERR(mock.ProcessReverseStream(&frame));
 
@@ -57,6 +57,7 @@ TEST(AudioProcessingImplTest, AudioParameterChangeTriggersInit) {
   EXPECT_NOERR(mock.ProcessStream(&frame));
 
   // New number of channels.
+  // TODO(peah): Investigate why this causes 2 inits.
   frame.num_channels_ = 2;
   EXPECT_CALL(mock, InitializeLocked())
       .Times(2);