| Index: webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h
 | 
| diff --git a/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h b/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h
 | 
| index 88b06ce00e5a2dc046a5d38740a79c6f843fad76..de6b9f4ad00b5560f3b41e740c5787e031506eeb 100644
 | 
| --- a/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h
 | 
| +++ b/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h
 | 
| @@ -62,7 +62,8 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
 | 
|    enum { kProcessPeriodicityInMs = 10 };
 | 
|  
 | 
|    explicit NewAudioConferenceMixerImpl(int id);
 | 
| -  ~NewAudioConferenceMixerImpl();
 | 
| +  // The dtor not needed, because this class does no longer manage
 | 
| +  // memory.
 | 
|  
 | 
|    // Must be called after ctor.
 | 
|    bool Init();
 | 
| @@ -79,8 +80,6 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
 | 
|        const MixerAudioSource& audio_source) const override;
 | 
|  
 | 
|   private:
 | 
| -  enum { DEFAULT_AUDIO_FRAME_POOLSIZE = 50 };
 | 
| -
 | 
|    // Set/get mix frequency
 | 
|    int32_t SetOutputFrequency(const Frequency& frequency);
 | 
|    Frequency OutputFrequency() const;
 | 
| @@ -151,11 +150,9 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
 | 
|    Frequency _outputFrequency;
 | 
|    size_t _sampleSize;
 | 
|  
 | 
| -  // Memory pool to avoid allocating/deallocating AudioFrames
 | 
| -  MemoryPool<AudioFrame>* _audioFramePool;
 | 
| -
 | 
|    // List of all audio sources. Note all lists are disjunct
 | 
|    MixerAudioSourceList audio_source_list_;  // May be mixed.
 | 
| +
 | 
|    // Always mixed, anonomously.
 | 
|    MixerAudioSourceList additional_audio_source_list_;
 | 
|  
 | 
| 
 |