Revert "Moved congestion controller to goog_cc folder."
This reverts commit e6cefdf9c572cdce55ff0497ad6e516c76132ee8.
Reason for revert: conflicts with reverting https://webrtc-review.googlesource.com/c/src/+/52980
Original change's description:
> Moved congestion controller to goog_cc folder.
>
> Bug: webrtc:8415
> Change-Id: I2070da0cacf1dbfc4b6a89285af3e68fd03497ab
> Reviewed-on: https://webrtc-review.googlesource.com/43841
> Commit-Queue: Sebastian Jansson <srte@webrtc.org>
> Reviewed-by: Björn Terelius <terelius@webrtc.org>
> Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#21928}
TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: webrtc:8415
Change-Id: If8965e1e745e57694192b9ca2a69503c722658d9
Reviewed-on: https://webrtc-review.googlesource.com/53020
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22012}diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index ea831ac..ddd77d1 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -149,9 +149,9 @@
"../../test:test_support",
"../bitrate_controller",
"../congestion_controller",
+ "../congestion_controller:delay_based_bwe",
+ "../congestion_controller:estimators",
"../congestion_controller:transport_feedback",
- "../congestion_controller/goog_cc:delay_based_bwe",
- "../congestion_controller/goog_cc:estimators",
"../pacing",
"../rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",