Move delay_based_bwe_ into CongestionController

webrtc/tools/event_log_visualizer/analyzer.cc

Index: webrtc/tools/event_log_visualizer/analyzer.cc
diff --git a/webrtc/tools/event_log_visualizer/analyzer.cc b/webrtc/tools/event_log_visualizer/analyzer.cc
index 998c6b025f4733cc35a6369be4a61a1a9d7ddd5c..a0f31230f92ac75e7ea551f6bd55a0888792420d 100644
--- a/webrtc/tools/event_log_visualizer/analyzer.cc
+++ b/webrtc/tools/event_log_visualizer/analyzer.cc
@@ -1046,12 +1046,10 @@ void EventLogAnalyzer::CreateBweSimulationGraph(Plot* plot) {
       RTC_DCHECK_EQ(clock.TimeInMicroseconds(), NextRtcpTime());
       const LoggedRtcpPacket& rtcp = *rtcp_iterator->second;
       if (rtcp.type == kRtcpTransportFeedback) {
-        TransportFeedbackObserver* observer = cc.GetTransportFeedbackObserver();
-        observer->OnTransportFeedback(*static_cast<rtcp::TransportFeedback*>(
-            rtcp.packet.get()));
+        cc.OnTransportFeedback(
+            *static_cast<rtcp::TransportFeedback*>(rtcp.packet.get()));
         // TODO(elad.alon): Modify this (before landing).
-        std::vector<PacketFeedback> feedback =
-            observer->GetTransportFeedbackVector();
+        std::vector<PacketFeedback> feedback = cc.GetTransportFeedbackVector();
         rtc::Optional<uint32_t> bitrate_bps;
         if (!feedback.empty()) {
           for (const PacketFeedback& packet : feedback)
@@ -1072,9 +1070,8 @@ void EventLogAnalyzer::CreateBweSimulationGraph(Plot* plot) {
       const LoggedRtpPacket& rtp = *rtp_iterator->second;
       if (rtp.header.extension.hasTransportSequenceNumber) {
         RTC_DCHECK(rtp.header.extension.hasTransportSequenceNumber);
-        cc.GetTransportFeedbackObserver()->AddPacket(
-            rtp.header.extension.transportSequenceNumber, rtp.total_length,
-            PacedPacketInfo());
+        cc.AddPacket(rtp.header.extension.transportSequenceNumber,
+                     rtp.total_length, PacedPacketInfo());
         rtc::SentPacket sent_packet(
             rtp.header.extension.transportSequenceNumber, rtp.timestamp / 1000);
         cc.OnSentPacket(sent_packet);
@@ -1153,8 +1150,8 @@ void EventLogAnalyzer::CreateNetworkDelayFeedbackGraph(Plot* plot) {
 
   SimulatedClock clock(0);
   NullBitrateController null_controller;
-  TransportFeedbackAdapter feedback_adapter(nullptr, &clock, &null_controller);
-  feedback_adapter.InitBwe();
+  TransportFeedbackAdapter feedback_adapter(&clock, &null_controller);
+  //  feedback_adapter.InitBwe();  // TODO(elad.alon): !!! Fix.
 
   TimeSeries time_series;
   time_series.label = "Network Delay Change";