Fold AudioEncoderMutable into AudioEncoder

webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b.h

Index: webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b.h
diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b.h b/webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b.h
index 6a0fb438bfd0d6cd5bc0f266500ae06773e9889b..5d368bce7ad216dfa0538496b6fe8d0dacd6f219 100644
--- a/webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b.h
+++ b/webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b.h
@@ -12,11 +12,12 @@
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_INCLUDE_AUDIO_ENCODER_PCM16B_H_
 
 #include "webrtc/base/scoped_ptr.h"
-#include "webrtc/modules/audio_coding/codecs/audio_encoder_mutable_impl.h"
 #include "webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h"
 
 namespace webrtc {
 
+struct CodecInst;
+
 class AudioEncoderPcm16B final : public AudioEncoderPcm {
  public:
   struct Config : public AudioEncoderPcm::Config {
@@ -29,6 +30,7 @@ class AudioEncoderPcm16B final : public AudioEncoderPcm {
 
   explicit AudioEncoderPcm16B(const Config& config)
       : AudioEncoderPcm(config, config.sample_rate_hz) {}
+  explicit AudioEncoderPcm16B(const CodecInst& codec_inst);
 
  protected:
   size_t EncodeCall(const int16_t* audio,
@@ -38,13 +40,5 @@ class AudioEncoderPcm16B final : public AudioEncoderPcm {
   int BytesPerSample() const override;
 };
 
-struct CodecInst;
-
-class AudioEncoderMutablePcm16B
-    : public AudioEncoderMutableImpl<AudioEncoderPcm16B> {
- public:
-  explicit AudioEncoderMutablePcm16B(const CodecInst& codec_inst);
-};
-
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_INCLUDE_AUDIO_ENCODER_PCM16B_H_