Remove MimdRateControl and factories for RemoteBitrateEstimor.

webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h

Index: webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h
diff --git a/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h b/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h
index 6c09f2427a0e5de0c762abc797bd1b94295d757b..0eb41006f187b4f90a84cbaca2140b1dad628e06 100644
--- a/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h
+++ b/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h
@@ -19,17 +19,13 @@
 #include "webrtc/common_types.h"
 #include "webrtc/modules/interface/module.h"
 #include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"

[stefan-webrtc, 2015/06/30 11:38:18]

Needed?

[sprang_webrtc, 2015/07/06 07:54:29]

Done.

 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 class Clock;
 
-enum RateControlType {
-  kMimdControl,
-  kAimdControl
-};
-
 // RemoteBitrateObserver is used to signal changes in bitrate estimates for
 // the incoming streams.
 class RemoteBitrateObserver {
@@ -125,28 +121,6 @@ class RemoteBitrateEstimator : public CallStatsObserver, public Module {
   static const int64_t kStreamTimeOutMs = 2000;
 };
 
-struct RemoteBitrateEstimatorFactory {
-  RemoteBitrateEstimatorFactory() {}
-  virtual ~RemoteBitrateEstimatorFactory() {}
-
-  virtual RemoteBitrateEstimator* Create(
-      RemoteBitrateObserver* observer,
-      Clock* clock,
-      RateControlType control_type,
-      uint32_t min_bitrate_bps) const;
-};
-
-struct AbsoluteSendTimeRemoteBitrateEstimatorFactory
-    : public RemoteBitrateEstimatorFactory {
-  AbsoluteSendTimeRemoteBitrateEstimatorFactory() {}
-  virtual ~AbsoluteSendTimeRemoteBitrateEstimatorFactory() {}
-
-  virtual RemoteBitrateEstimator* Create(
-      RemoteBitrateObserver* observer,
-      Clock* clock,
-      RateControlType control_type,
-      uint32_t min_bitrate_bps) const;
-};
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_REMOTE_BITRATE_ESTIMATOR_H_