Fold AudioEncoderMutable into AudioEncoder

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

Index: webrtc/modules/audio_coding/main/acm2/codec_manager.h
diff --git a/webrtc/modules/audio_coding/main/acm2/codec_manager.h b/webrtc/modules/audio_coding/main/acm2/codec_manager.h
index bb9545d889bd5eebd45084e3e83ff734d87a9f56..3372b7f27bd03cf2e2b5b84c814d2053aab25719 100644
--- a/webrtc/modules/audio_coding/main/acm2/codec_manager.h
+++ b/webrtc/modules/audio_coding/main/acm2/codec_manager.h
@@ -22,7 +22,6 @@ namespace webrtc {
 
 class AudioDecoder;
 class AudioEncoder;
-class AudioEncoderMutable;
 
 namespace acm2 {
 
@@ -33,7 +32,7 @@ class CodecManager final {
 
   int RegisterEncoder(const CodecInst& send_codec);
 
-  void RegisterEncoder(AudioEncoderMutable* external_speech_encoder);
+  void RegisterEncoder(AudioEncoder* external_speech_encoder);
 
   int GetCodecInst(CodecInst* current_codec) const;
 
@@ -58,12 +57,11 @@ class CodecManager final {
 
   bool codec_fec_enabled() const { return codec_fec_enabled_; }
 
-  AudioEncoderMutable* CurrentSpeechEncoder() {
-    return codec_owner_.SpeechEncoder();
-  }
   AudioEncoder* CurrentEncoder() { return codec_owner_.Encoder(); }
   const AudioEncoder* CurrentEncoder() const { return codec_owner_.Encoder(); }
 
+  bool CurrentEncoderIsOpus() const { return encoder_is_opus_; }
+
  private:
   int CngPayloadType(int sample_rate_hz) const;
 
@@ -82,6 +80,7 @@ class CodecManager final {
   bool red_enabled_;
   bool codec_fec_enabled_;
   CodecOwner codec_owner_;
+  bool encoder_is_opus_;
 
   DISALLOW_COPY_AND_ASSIGN(CodecManager);
 };