Let Rent-A-Codec™ create and own speech encoders

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 d0fb4f760efe8b2be85824e24594176c9e71bbeb..29ac098906a8054f1859e77cc11a0ad6dd18ee4e 100644
--- a/webrtc/modules/audio_coding/main/acm2/codec_owner.h
+++ b/webrtc/modules/audio_coding/main/acm2/codec_owner.h
@@ -16,17 +16,9 @@
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
+#include "webrtc/modules/audio_coding/main/acm2/rent_a_codec.h"
 #include "webrtc/modules/audio_coding/main/include/audio_coding_module_typedefs.h"
 
-#if defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)
-#include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h"
-#else
-// Dummy implementation, for when we don't have iSAC.
-namespace webrtc {
-class LockedIsacBandwidthInfo {};
-}
-#endif
-
 namespace webrtc {
 namespace acm2 {
 
@@ -59,25 +51,15 @@ class CodecOwner {
   const AudioEncoder* Encoder() const;
 
  private:
-  AudioEncoder* SpeechEncoder();
-  const AudioEncoder* SpeechEncoder() const;
-
-  // At most one of these is non-null:
-  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_;
+  AudioEncoder* speech_encoder_;
 
   // |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_;
 
+  RentACodec rent_a_codec_;
+
   RTC_DISALLOW_COPY_AND_ASSIGN(CodecOwner);
 };