Reland: Fix circular dependency in BWE code.
Diff patch set 1 and 2 to see actual differences to the last
patch.
Bug: webrtc:6828
Change-Id: Ie0c85d41df47c2a2505bc71b20fdb3834bdeaf12
Reviewed-on: https://webrtc-review.googlesource.com/36920
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21492}
diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index ef7ee11..89e74c4 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -155,6 +155,8 @@
"../../voice_engine",
"../bitrate_controller",
"../congestion_controller",
+ "../congestion_controller:delay_based_bwe",
+ "../congestion_controller:estimators",
"../pacing",
"../rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",