Add interval estimator to remote bitrate estimator

webrtc/modules/remote_bitrate_estimator/include/mock/mock_aimd_rate_control.h

Index: webrtc/modules/remote_bitrate_estimator/include/mock/mock_aimd_rate_control.h
diff --git a/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h b/webrtc/modules/remote_bitrate_estimator/include/mock/mock_aimd_rate_control.h
similarity index 59%
copy from webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h
copy to webrtc/modules/remote_bitrate_estimator/include/mock/mock_aimd_rate_control.h
index c3fb6acc99e0f6098b280b6948cfa03e42851344..822f91afd312e1273b53c682488a32fff18abfb5 100644
--- a/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h
+++ b/webrtc/modules/remote_bitrate_estimator/include/mock/mock_aimd_rate_control.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2016 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
@@ -8,22 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_MOCK_MOCK_REMOTE_BITRATE_OBSERVER_H_
-#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_MOCK_MOCK_REMOTE_BITRATE_OBSERVER_H_
+#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_MOCK_MOCK_AIMD_RATE_CONTROL_H_
+#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_MOCK_MOCK_AIMD_RATE_CONTROL_H_
 
-#include <vector>
-
-#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
+#include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
 #include "webrtc/test/gmock.h"
 
 namespace webrtc {
 
-class MockRemoteBitrateObserver : public RemoteBitrateObserver {
+class MockAimdRateControl : public AimdRateControl {
  public:
-  MOCK_METHOD2(OnReceiveBitrateChanged,
-      void(const std::vector<unsigned int>& ssrcs, unsigned int bitrate));
+  MOCK_CONST_METHOD0(GetNearMaxIncreaseRateBps, int());
+  MOCK_CONST_METHOD0(GetLastBitrateDecreaseBps, rtc::Optional<int>());
 };
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_MOCK_MOCK_REMOTE_BITRATE_OBSERVER_H_
+#endif  // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_MOCK_MOCK_AIMD_RATE_CONTROL_H_