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

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

Index: webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h
index aa7914ef1a2344e114484e180d00078500ba4e98..90ec50fc8a0fd7d116df99abb8ec17defe180c62 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h
@@ -14,7 +14,7 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/call/mock/mock_rtc_event_log.h"
+#include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
 
@@ -22,10 +22,10 @@ namespace webrtc {
 namespace testing {
 namespace bwe {
 
-class FullBweSender : public BweSender, public RemoteBitrateObserver {
+class SendSideBweSender : public BweSender, public RemoteBitrateObserver {
  public:
-  FullBweSender(int kbps, BitrateObserver* observer, Clock* clock);
-  virtual ~FullBweSender();
+  SendSideBweSender(int kbps, BitrateObserver* observer, Clock* clock);
+  virtual ~SendSideBweSender();
 
   int GetFeedbackIntervalMs() const override;
   void GiveFeedback(const FeedbackPacket& feedback) override;
@@ -37,7 +37,7 @@ class FullBweSender : public BweSender, public RemoteBitrateObserver {
 
  protected:
   std::unique_ptr<BitrateController> bitrate_controller_;
-  std::unique_ptr<RemoteBitrateEstimator> rbe_;
+  std::unique_ptr<DelayBasedBwe> bwe_;
   std::unique_ptr<RtcpBandwidthObserver> feedback_observer_;
 
  private:
@@ -50,7 +50,7 @@ class FullBweSender : public BweSender, public RemoteBitrateObserver {
   SequenceNumberUnwrapper seq_num_unwrapper_;
   ::testing::NiceMock<MockRtcEventLog> event_log_;
 
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FullBweSender);
+  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SendSideBweSender);
 };
 
 class SendSideBweReceiver : public BweReceiver {