Fold AudioEncoderMutable into AudioEncoder

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

 /*
  *  Copyright (c) 2015 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 16 matching lines @@
 class CodecOwner {
  public:
   CodecOwner();
   ~CodecOwner();
 
   void SetEncoders(const CodecInst& speech_inst,
                    int cng_payload_type,
                    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);
 
   void ChangeCngAndRed(int cng_payload_type,
                        ACMVADMode vad_mode,
                        int red_payload_type);
 
   // Returns a pointer to an iSAC decoder owned by the CodecOwner. The decoder
   // will live as long as the CodecOwner exists.
   AudioDecoder* GetIsacDecoder();
 
   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.
   rtc::scoped_ptr<AudioDecoder> isac_decoder_;
 
   // iSAC bandwidth estimation info, for use with iSAC encoders and decoders.
   LockedIsacBandwidthInfo isac_bandwidth_info_;
 
   // |cng_encoder_| and |red_encoder_| are valid iff CNG or RED, respectively,
   // are active.
   rtc::scoped_ptr<AudioEncoder> cng_encoder_;
   rtc::scoped_ptr<AudioEncoder> red_encoder_;
 
   DISALLOW_COPY_AND_ASSIGN(CodecOwner);
 };
 
 }  // namespace acm2
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_OWNER_H_