External APM usage downstream dependency support cleanup

webrtc/audio/audio_state.h

Index: webrtc/audio/audio_state.h
diff --git a/webrtc/audio/audio_state.h b/webrtc/audio/audio_state.h
index 8a98d5739ef2e2811935c9a96a4cafbd724d8132..cc38f0bcb70e5035543cf305d2dc8da8ff7e8b7e 100644
--- a/webrtc/audio/audio_state.h
+++ b/webrtc/audio/audio_state.h
@@ -28,11 +28,9 @@ class AudioState final : public webrtc::AudioState,
   explicit AudioState(const AudioState::Config& config);
   ~AudioState() override;
 
-  // TODO(peah): Remove the conditional when upstream dependencies have properly
-  // been resolved.
   AudioProcessing* audio_processing() override {
-    return config_.audio_processing ? config_.audio_processing.get()
-                                    : voe_base_->audio_processing();
+    RTC_DCHECK(config_.audio_processing);
+    return config_.audio_processing.get();
   }
 
   VoiceEngine* voice_engine();