Reland: Fix race / crash in OnNetworkRouteChanged().

webrtc/modules/bitrate_controller/include/bitrate_controller.h

Index: webrtc/modules/bitrate_controller/include/bitrate_controller.h
diff --git a/webrtc/modules/bitrate_controller/include/bitrate_controller.h b/webrtc/modules/bitrate_controller/include/bitrate_controller.h
index 90b64713907d368f03456c3243f5967b8948b89b..7400d7d032b6f1607a83f7264467efb0967c3761 100644
--- a/webrtc/modules/bitrate_controller/include/bitrate_controller.h
+++ b/webrtc/modules/bitrate_controller/include/bitrate_controller.h
@@ -17,9 +17,9 @@
 
 #include <map>
 
+#include "webrtc/modules/congestion_controller/delay_based_bwe.h"
 #include "webrtc/modules/include/module.h"
 #include "webrtc/modules/pacing/paced_sender.h"
-#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 
 namespace webrtc {
@@ -44,7 +44,7 @@ class BitrateObserver {
   virtual ~BitrateObserver() {}
 };
 
-class BitrateController : public Module, public RemoteBitrateObserver {
+class BitrateController : public Module {
   // This class collects feedback from all streams sent to a peer (via
   // RTCPBandwidthObservers). It does one  aggregated send side bandwidth
   // estimation and divide the available bitrate between all its registered
@@ -78,6 +78,8 @@ class BitrateController : public Module, public RemoteBitrateObserver {
                              int min_bitrate_bps,
                              int max_bitrate_bps) = 0;
 
+  virtual void OnDelayBasedBweResult(const DelayBasedBwe::Result& result) = 0;
+
   // Gets the available payload bandwidth in bits per second. Note that
   // this bandwidth excludes packet headers.
   virtual bool AvailableBandwidth(uint32_t* bandwidth) const = 0;