Simplify CongestionController.

webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h

Index: webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h
diff --git a/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h b/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h
index b29d6bee810b14c7941deadc5ef181c78ccebdd5..58016f48fb38b2cf1eca17b26b35e6b4138924eb 100644
--- a/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h
+++ b/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h
@@ -17,20 +17,18 @@
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 #include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h"
 
 namespace webrtc {
 
 class ProcessThread;
+class RemoteBitrateEstimator;
 
 class TransportFeedbackAdapter : public TransportFeedbackObserver,
                                  public CallStatsObserver,
                                  public RemoteBitrateObserver {
  public:
-  TransportFeedbackAdapter(BitrateController* bitrate_controller,
-                           Clock* clock,
-                           ProcessThread* process_thread);
+  TransportFeedbackAdapter(BitrateController* bitrate_controller, Clock* clock);
   virtual ~TransportFeedbackAdapter();
 
   void AddPacket(uint16_t sequence_number,

[the sun, 2016/02/17 13:50:55]

Can we group the overrides by interface, like elsewhere?

[stefan-webrtc, 2016/02/17 14:14:27]

Done.

@@ -47,16 +45,16 @@ class TransportFeedbackAdapter : public TransportFeedbackObserver,
     return bitrate_estimator_.get();
   }
 
+  void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
+
  private:
   void OnReceiveBitrateChanged(const std::vector<uint32_t>& ssrcs,
                                uint32_t bitrate) override;
-  void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
 
   rtc::CriticalSection lock_;
   SendTimeHistory send_time_history_ GUARDED_BY(&lock_);
   BitrateController* bitrate_controller_;
   rtc::scoped_ptr<RemoteBitrateEstimator> bitrate_estimator_;
-  ProcessThread* const process_thread_;
   Clock* const clock_;
   int64_t current_offset_ms_;
   int64_t last_timestamp_us_;