| Index: webrtc/audio/audio_state.cc
|
| diff --git a/webrtc/audio/audio_state.cc b/webrtc/audio/audio_state.cc
|
| index 961e772a9de3dcb5887bdcaa9159c0eebab6e713..1750010f97f81fb40aa2edcecc5f9c5ec1efb13f 100644
|
| --- a/webrtc/audio/audio_state.cc
|
| +++ b/webrtc/audio/audio_state.cc
|
| @@ -19,15 +19,11 @@
|
| namespace webrtc {
|
| namespace internal {
|
|
|
| -// TODO(peah): Remove the conditional in the audio_transport_proxy_ constructor
|
| -// call when upstream dependencies have properly been resolved.
|
| AudioState::AudioState(const AudioState::Config& config)
|
| : config_(config),
|
| voe_base_(config.voice_engine),
|
| audio_transport_proxy_(voe_base_->audio_transport(),
|
| - config_.audio_processing
|
| - ? config_.audio_processing.get()
|
| - : voe_base_->audio_processing(),
|
| + config_.audio_processing.get(),
|
| config_.audio_mixer) {
|
| process_thread_checker_.DetachFromThread();
|
| RTC_DCHECK(config_.audio_mixer);
|
|
|