commit aba85d1f5326621f395427f13cd650a063048d96
author Patrik Höglund <phoglund@webrtc.org> Tue Nov 28 15:46:08 2017 +0100
committer Commit Bot <commit-bot@chromium.org> Tue Nov 28 15:28:58 2017 +0000
tree 437415ca46e4588a89e057f73e2f398b74d3626e
parent b874a352272aa7f35e63d0080ca807057f821584

Resolve circular dependency in rtc_media_base.

This one was pretty straightforward fortunately.

Bug: webrtc:6828
Change-Id: Ie7b5e71f1298c409dbca2c74eaa09c0986e41d8f
Reviewed-on: https://webrtc-review.googlesource.com/25821
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20914}

media/engine/webrtcvoiceengine.h

diff --git a/media/engine/webrtcvoiceengine.h b/media/engine/webrtcvoiceengine.h
index 456da52..8984299 100644
--- a/media/engine/webrtcvoiceengine.h
+++ b/media/engine/webrtcvoiceengine.h
@@ -192,7 +192,7 @@
   bool RemoveSendStream(uint32_t ssrc) override;
   bool AddRecvStream(const StreamParams& sp) override;
   bool RemoveRecvStream(uint32_t ssrc) override;
-  bool GetActiveStreams(AudioInfo::StreamList* actives) override;
+  bool GetActiveStreams(StreamList* actives) override;
   int GetOutputLevel() override;
   // SSRC=0 will apply the new volume to current and future unsignaled streams.
   bool SetOutputVolume(uint32_t ssrc, double volume) override;