Revert "Reland of Remove SendPacer from ViEEncoder

webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h

Index: webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h
diff --git a/webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h b/webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h
index 20955ea81a87b858310eec162fdf48df93e4fed3..c5b24128455f9523c68e9922e6fe94950982bf76 100644
--- a/webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h
+++ b/webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h
@@ -19,20 +19,14 @@
 namespace webrtc {
 namespace test {
 
-class MockCongestionObserver : public CongestionController::Observer {
- public:
-  MOCK_METHOD3(OnNetworkChanged,
-               void(uint32_t bitrate_bps,
-                    uint8_t fraction_loss,
-                    int64_t rtt_ms));
-};
-
 class MockCongestionController : public CongestionController {
  public:
   MockCongestionController(Clock* clock,
-                           Observer* observer,
+                           BitrateObserver* bitrate_observer,
                            RemoteBitrateObserver* remote_bitrate_observer)
-      : CongestionController(clock, observer, remote_bitrate_observer) {}
+      : CongestionController(clock,
+                             bitrate_observer,
+                             remote_bitrate_observer) {}
   MOCK_METHOD3(SetBweBitrates,
                void(int min_bitrate_bps,
                     int start_bitrate_bps,