Merge UpdateBandwidthEstimate with Update in AimdRateControl.

webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h

Index: webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h
diff --git a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h b/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h
index 03fc2d3f9e54274aacc88f342e992b9068a2f508..5a0a34584f7520c60ce4d4797ae33b5595d9d3af 100644
--- a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h
+++ b/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h
@@ -39,9 +39,8 @@ class AimdRateControl {
   bool TimeToReduceFurther(int64_t time_now,
                            uint32_t incoming_bitrate_bps) const;
   uint32_t LatestEstimate() const;
-  uint32_t UpdateBandwidthEstimate(int64_t now_ms);
   void SetRtt(int64_t rtt);
-  void Update(const RateControlInput* input, int64_t now_ms);
+  uint32_t Update(const RateControlInput* input, int64_t now_ms);
   void SetEstimate(int bitrate_bps, int64_t now_ms);
 
   // Returns the increase rate which is used when used bandwidth is near the
@@ -59,7 +58,7 @@ class AimdRateControl {
   // incoming bitrate. When in the "hold" state the bitrate will be kept
   // constant to allow built up queues to drain.
   uint32_t ChangeBitrate(uint32_t current_bitrate,
-                         uint32_t incoming_bitrate,
+                         const RateControlInput& input,
                          int64_t now_ms);
   // Clamps new_bitrate_bps to within the configured min bitrate and a linear
   // function of the incoming bitrate, so that the new bitrate can't grow too
@@ -72,7 +71,6 @@ class AimdRateControl {
   void UpdateChangePeriod(int64_t now_ms);
   void UpdateMaxBitRateEstimate(float incoming_bit_rate_kbps);
   void ChangeState(const RateControlInput& input, int64_t now_ms);
-  void ChangeState(RateControlState new_state);
   void ChangeRegion(RateControlRegion region);
 
   uint32_t min_configured_bitrate_bps_;
@@ -83,8 +81,6 @@ class AimdRateControl {
   RateControlState rate_control_state_;
   RateControlRegion rate_control_region_;
   int64_t time_last_bitrate_change_;
-  RateControlInput current_input_;
-  bool updated_;
   int64_t time_first_incoming_estimate_;
   bool bitrate_is_initialized_;
   float beta_;