Fold AudioEncoderMutable into AudioEncoder

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

Index: webrtc/modules/audio_coding/main/acm2/codec_owner.h
diff --git a/webrtc/modules/audio_coding/main/acm2/codec_owner.h b/webrtc/modules/audio_coding/main/acm2/codec_owner.h
index 2c5e942ef56da9f16b71ee1cd39be6fe2ac9d700..cb533b676be2a685cc5a57afdf313b2e2e25b939 100644
--- a/webrtc/modules/audio_coding/main/acm2/codec_owner.h
+++ b/webrtc/modules/audio_coding/main/acm2/codec_owner.h
@@ -34,7 +34,7 @@ class CodecOwner {
                    ACMVADMode vad_mode,
                    int red_payload_type);
 
-  void SetEncoders(AudioEncoderMutable* external_speech_encoder,
+  void SetEncoders(AudioEncoder* external_speech_encoder,
                    int cng_payload_type,
                    ACMVADMode vad_mode,
                    int red_payload_type);
@@ -49,13 +49,14 @@ class CodecOwner {
 
   AudioEncoder* Encoder();
   const AudioEncoder* Encoder() const;
-  AudioEncoderMutable* SpeechEncoder();
-  const AudioEncoderMutable* SpeechEncoder() const;
 
  private:
+  AudioEncoder* SpeechEncoder();
+  const AudioEncoder* SpeechEncoder() const;
+
   // At most one of these is non-null:
-  rtc::scoped_ptr<AudioEncoderMutable> speech_encoder_;
-  AudioEncoderMutable* external_speech_encoder_;
+  rtc::scoped_ptr<AudioEncoder> speech_encoder_;
+  AudioEncoder* external_speech_encoder_;
 
   // If we've created an iSAC decoder because someone called GetIsacDecoder,
   // store it here.