Revert of Fix race / crash in OnNetworkRouteChanged().

webrtc/modules/bitrate_controller/bitrate_controller_impl.cc

Index: webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
index b3363679bd8abcbae3954f725ecfebf05a1fd130..bc2f1f63e6d38c186d9e5c89df7b9d1fe60741ae 100644
--- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
+++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
@@ -186,18 +186,22 @@
   MaybeTriggerOnNetworkChanged();
 }
 
-void BitrateControllerImpl::OnDelayBasedBweResult(
-    const DelayBasedBwe::Result& result) {
-  if (!result.updated)
-    return;
-  {
-    rtc::CritScope cs(&critsect_);
-    if (result.probe) {
-      bandwidth_estimation_.SetSendBitrate(result.target_bitrate_bps);
-    } else {
-      bandwidth_estimation_.UpdateDelayBasedEstimate(
-          clock_->TimeInMilliseconds(), result.target_bitrate_bps);
-    }
+void BitrateControllerImpl::OnProbeBitrate(uint32_t bitrate_bps) {
+  {
+    rtc::CritScope cs(&critsect_);
+    bandwidth_estimation_.SetSendBitrate(bitrate_bps);
+  }
+  MaybeTriggerOnNetworkChanged();
+}
+
+// TODO(isheriff): Perhaps need new interface for invocation from DelayBasedBwe.
+void BitrateControllerImpl::OnReceiveBitrateChanged(
+    const std::vector<uint32_t>& ssrcs,
+    uint32_t bitrate_bps) {
+  {
+    rtc::CritScope cs(&critsect_);
+    bandwidth_estimation_.UpdateDelayBasedEstimate(clock_->TimeInMilliseconds(),
+                                                   bitrate_bps);
   }
   MaybeTriggerOnNetworkChanged();
 }