Fix BWE simulations so that it uses the delay based BWE.

webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc

Index: webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
index 0b9312890fdc2e821c0f9760fe6620613b714172..0203a910d8e1d9da3626deee9ce64bb7fe40496e 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
@@ -13,7 +13,7 @@
 #include <algorithm>
 
 #include "webrtc/base/logging.h"
-#include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h"
+#include "webrtc/modules/congestion_controller/delay_based_bwe.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 
 namespace webrtc {
@@ -22,12 +22,14 @@ namespace bwe {
 
 const int kFeedbackIntervalMs = 50;
 
-FullBweSender::FullBweSender(int kbps, BitrateObserver* observer, Clock* clock)
+SendSideBweSender::SendSideBweSender(int kbps,
+                                     BitrateObserver* observer,
+                                     Clock* clock)
     : bitrate_controller_(
           BitrateController::CreateBitrateController(clock,
                                                      observer,
                                                      &event_log_)),
-      rbe_(new RemoteBitrateEstimatorAbsSendTime(this, clock)),
+      bwe_(new DelayBasedBwe(clock)),
       feedback_observer_(bitrate_controller_->CreateRtcpBandwidthObserver()),
       clock_(clock),
       send_time_history_(clock_, 10000),
@@ -39,17 +41,16 @@ FullBweSender::FullBweSender(int kbps, BitrateObserver* observer, Clock* clock)
   bitrate_controller_->SetStartBitrate(1000 * kbps);
   bitrate_controller_->SetMinMaxBitrate(1000 * kMinBitrateKbps,
                                         1000 * kMaxBitrateKbps);
-  rbe_->SetMinBitrate(1000 * kMinBitrateKbps);
+  bwe_->SetMinBitrate(1000 * kMinBitrateKbps);
 }
 
-FullBweSender::~FullBweSender() {
-}
+SendSideBweSender::~SendSideBweSender() {}
 
-int FullBweSender::GetFeedbackIntervalMs() const {
+int SendSideBweSender::GetFeedbackIntervalMs() const {
   return kFeedbackIntervalMs;
 }
 
-void FullBweSender::GiveFeedback(const FeedbackPacket& feedback) {
+void SendSideBweSender::GiveFeedback(const FeedbackPacket& feedback) {
   const SendSideBweFeedback& fb =
       static_cast<const SendSideBweFeedback&>(feedback);
   if (fb.packet_feedback_vector().empty())
@@ -67,10 +68,14 @@ void FullBweSender::GiveFeedback(const FeedbackPacket& feedback) {
 
   int64_t rtt_ms =
       clock_->TimeInMilliseconds() - feedback.latest_send_time_ms();
-  rbe_->OnRttUpdate(rtt_ms, rtt_ms);
+  bwe_->OnRttUpdate(rtt_ms, rtt_ms);
   BWE_TEST_LOGGING_PLOT(1, "RTT", clock_->TimeInMilliseconds(), rtt_ms);
 
-  rbe_->IncomingPacketFeedbackVector(packet_feedback_vector);
+  DelayBasedBwe::Result result =
+      bwe_->IncomingPacketFeedbackVector(packet_feedback_vector);
+  if (result.updated)
+    bitrate_controller_->OnDelayBasedBweResult(result);
+
   if (has_received_ack_) {
     int expected_packets = fb.packet_feedback_vector().back().sequence_number -
                            last_acked_seq_num_;
@@ -99,7 +104,7 @@ void FullBweSender::GiveFeedback(const FeedbackPacket& feedback) {
   }
 }
 
-void FullBweSender::OnPacketsSent(const Packets& packets) {
+void SendSideBweSender::OnPacketsSent(const Packets& packets) {
   for (Packet* packet : packets) {
     if (packet->GetPacketType() == Packet::kMedia) {
       MediaPacket* media_packet = static_cast<MediaPacket*>(packet);
@@ -114,17 +119,17 @@ void FullBweSender::OnPacketsSent(const Packets& packets) {
   }
 }
 
-void FullBweSender::OnReceiveBitrateChanged(const std::vector<uint32_t>& ssrcs,
-                                            uint32_t bitrate) {
+void SendSideBweSender::OnReceiveBitrateChanged(
+    const std::vector<uint32_t>& ssrcs,
+    uint32_t bitrate) {
   feedback_observer_->OnReceivedEstimatedBitrate(bitrate);
 }
 
-int64_t FullBweSender::TimeUntilNextProcess() {
+int64_t SendSideBweSender::TimeUntilNextProcess() {
   return bitrate_controller_->TimeUntilNextProcess();
 }
 
-void FullBweSender::Process() {
-  rbe_->Process();
+void SendSideBweSender::Process() {
   bitrate_controller_->Process();
 }