Fold AudioEncoderMutable into AudioEncoder

webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.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 368 matching lines @@
 
   // Go back to noise again, and verify that a SID frame is emitted.
   EXPECT_CALL(*mock_vad_, VoiceActivity(_, _, _))
       .WillOnce(Return(Vad::kPassive));
   Encode();
   EXPECT_EQ(kCngPayloadType, encoded_info_.payload_type);
   EXPECT_EQ(static_cast<size_t>(config_.num_cng_coefficients) + 1,
             encoded_info_.encoded_bytes);
 }
 
+// Resetting the CNG should reset both the VAD and the encoder.
+TEST_F(AudioEncoderCngTest, Reset) {
+  CreateCng();
+  EXPECT_CALL(mock_encoder_, Reset()).Times(1);
+  EXPECT_CALL(*mock_vad_, Reset()).Times(1);
+  cng_->Reset();
+}
+
 #if GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 
 // This test fixture tests various error conditions that makes the
 // AudioEncoderCng die via CHECKs.
 class AudioEncoderCngDeathTest : public AudioEncoderCngTest {
  protected:
   AudioEncoderCngDeathTest() : AudioEncoderCngTest() {
     // Don't provide a Vad mock object, since it will leak when the test dies.
     config_.vad = NULL;
     EXPECT_CALL(*mock_vad_, Die()).Times(1);
@@ skipping 48 matching lines @@
       .WillRepeatedly(Return(7U));
   for (int i = 0; i < 6; ++i)
     Encode();
   EXPECT_DEATH(Encode(),
                "Frame size cannot be larger than 60 ms when using VAD/CNG.");
 }
 
 #endif  // GTEST_HAS_DEATH_TEST
 
 }  // namespace webrtc