Clean up of CongestionController.

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

Index: webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h
diff --git a/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h b/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h
index 91a8ac8707b5b19e3275ef8538f82b346cdcca2b..86e39fe3f1e35227f41d66f5fc263bf6664925b9 100644
--- a/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h
+++ b/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h
@@ -18,14 +18,19 @@
 
 namespace webrtc {
 
+class MockRemoteBitrateObserver : public RemoteBitrateObserver {
+ public:
+  MOCK_METHOD2(OnReceiveBitrateChanged,
+               void(const std::vector<uint32_t>& ssrcs, uint32_t bitrate));
+};
+
 class MockRemoteBitrateEstimator : public RemoteBitrateEstimator {
  public:
   MOCK_METHOD1(IncomingPacketFeedbackVector,
                void(const std::vector<PacketInfo>&));
   MOCK_METHOD4(IncomingPacket, void(int64_t, size_t, const RTPHeader&, bool));
-  MOCK_METHOD1(RemoveStream, void(unsigned int));
-  MOCK_CONST_METHOD2(LatestEstimate,
-                     bool(std::vector<unsigned int>*, unsigned int*));
+  MOCK_METHOD1(RemoveStream, void(uint32_t));
+  MOCK_CONST_METHOD2(LatestEstimate, bool(std::vector<uint32_t>*, uint32_t*));
   MOCK_CONST_METHOD1(GetStats, bool(ReceiveBandwidthEstimatorStats*));
 
   // From CallStatsObserver;