Fold AudioEncoderMutable into AudioEncoder

webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h

Index: webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h b/webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h
index 008e264987e7f1e19584bf2e79aa47a45b15aa82..523498bc3e46f2188913c688e6949db1a76bc09a 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h
+++ b/webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h
@@ -20,7 +20,7 @@
 #include "webrtc/system_wrappers/interface/clock.h"
 
 namespace webrtc {
-class AudioEncoderMutable;
+class AudioEncoder;
 
 namespace test {
 class InputAudioFile;
@@ -42,7 +42,7 @@ class AcmSendTestOldApi : public AudioPacketizationCallback,
                      int frame_size_samples);
 
   // Registers an external send codec. Returns true on success, false otherwise.
-  bool RegisterExternalCodec(AudioEncoderMutable* external_speech_encoder);
+  bool RegisterExternalCodec(AudioEncoder* external_speech_encoder);
 
   // Returns the next encoded packet. Returns NULL if the test duration was
   // exceeded. Ownership of the packet is handed over to the caller.