De-flake VideoSendStreamTest.ReconfigureBitratesSetsEncoderBitratesCorrectly

webrtc/modules/congestion_controller/congestion_controller.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 158 matching lines @@
                                           int start_bitrate_bps,
                                           int max_bitrate_bps) {
   // TODO(holmer): We should make sure the default bitrates are set to 10 kbps,
   // and that we don't try to set the min bitrate to 0 from any applications.
   // The congestion controller should allow a min bitrate of 0.
   const int kMinBitrateBps = 10000;
   if (min_bitrate_bps < kMinBitrateBps)
     min_bitrate_bps = kMinBitrateBps;
   if (max_bitrate_bps > 0)
     max_bitrate_bps = std::max(min_bitrate_bps, max_bitrate_bps);
-  if (start_bitrate_bps > 0) {
+  if (start_bitrate_bps > 0)
     start_bitrate_bps = std::max(min_bitrate_bps, start_bitrate_bps);
-    bitrate_controller_->SetStartBitrate(start_bitrate_bps);
-  }
-  bitrate_controller_->SetMinMaxBitrate(min_bitrate_bps, max_bitrate_bps);
+
+  bitrate_controller_->SetBitrates(start_bitrate_bps,
+                                   min_bitrate_bps,
+                                   max_bitrate_bps);
+
   if (remote_bitrate_estimator_)
     remote_bitrate_estimator_->SetMinBitrate(min_bitrate_bps);
   min_bitrate_bps_ = min_bitrate_bps;
   transport_feedback_adapter_.GetBitrateEstimator()->SetMinBitrate(
       min_bitrate_bps_);
 }
 
 BitrateController* CongestionController::GetBitrateController() const {
   return bitrate_controller_.get();
 }
@@ skipping 44 matching lines @@
   return std::min(bitrate_controller_->TimeUntilNextProcess(),
                   remote_bitrate_estimator_->TimeUntilNextProcess());
 }
 
 void CongestionController::Process() {
   bitrate_controller_->Process();
   remote_bitrate_estimator_->Process();
 }
 
 }  // namespace webrtc