Remove MimdRateControl and factories for RemoteBitrateEstimor.

webrtc/video/rampup_tests.h

 /*
  *  Copyright (c) 2014 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 22 matching lines @@
 class RtpHeaderParser;
 class RTPPayloadRegistry;
 class RtpRtcp;
 
 class StreamObserver : public newapi::Transport, public RemoteBitrateObserver {
  public:
   typedef std::map<uint32_t, int> BytesSentMap;
   typedef std::map<uint32_t, uint32_t> SsrcMap;
   StreamObserver(const SsrcMap& rtx_media_ssrcs,
                  newapi::Transport* feedback_transport,
-                 Clock* clock,
-                 RemoteBitrateEstimatorFactory* rbe_factory,
-                 RateControlType control_type);
+                 Clock* clock);
 
   void set_expected_bitrate_bps(unsigned int expected_bitrate_bps);
 
   void set_start_bitrate_bps(unsigned int start_bitrate_bps);
 
   void OnReceiveBitrateChanged(const std::vector<unsigned int>& ssrcs,
                                unsigned int bitrate) override;
 
   bool SendRtp(const uint8_t* packet, size_t length) override;
 
   bool SendRtcp(const uint8_t* packet, size_t length) override;
 
   EventTypeWrapper Wait();
 
+  void SetRemoteBitrateEstimator(RemoteBitrateEstimator* rbe);
+
  private:
   void ReportResult(const std::string& measurement,
                     size_t value,
                     const std::string& units);
   void TriggerTestDone() EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   Clock* const clock_;
   const rtc::scoped_ptr<EventWrapper> test_done_;
   const rtc::scoped_ptr<RtpHeaderParser> rtp_parser_;
   rtc::scoped_ptr<RtpRtcp> rtp_rtcp_;
@@ skipping 80 matching lines @@
   void RunRampUpTest(size_t num_streams,
                      unsigned int start_bitrate_bps,
                      const std::string& extension_type,
                      bool rtx,
                      bool red);
 
   void RunRampUpDownUpTest(size_t number_of_streams, bool rtx, bool red);
 };
 }  // namespace webrtc
 #endif  // WEBRTC_VIDEO_RAMPUP_TESTS_H_