Revert "Reland of Remove SendPacer from ViEEncoder

webrtc/video/vie_encoder.h

Index: webrtc/video/vie_encoder.h
diff --git a/webrtc/video/vie_encoder.h b/webrtc/video/vie_encoder.h
index e309dd5047c4b119b3e3d427cf5b2dce122623a2..5db5e3f6ba28f61cefbb60109d48558e73d4eb35 100644
--- a/webrtc/video/vie_encoder.h
+++ b/webrtc/video/vie_encoder.h
@@ -59,7 +59,10 @@ class ViEEncoder : public VideoEncoderRateObserver,
   ViEEncoder(uint32_t number_of_cores,
              ProcessThread* module_process_thread,
              SendStatisticsProxy* stats_proxy,
-             OveruseFrameDetector* overuse_detector);
+             // TODO(nisse): Used only for tests, delete?
+             rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback,
+             OveruseFrameDetector* overuse_detector,
+             PacedSender* pacer);
   ~ViEEncoder();
 
   vcm::VideoSender* video_sender();
@@ -130,7 +133,9 @@ class ViEEncoder : public VideoEncoderRateObserver,
   rtc::CriticalSection data_cs_;
 
   SendStatisticsProxy* const stats_proxy_;
+  rtc::VideoSinkInterface<VideoFrame>* const pre_encode_callback_;
   OveruseFrameDetector* const overuse_detector_;
+  PacedSender* const pacer_;
 
   // The time we last received an input frame or encoded frame. This is used to
   // track when video is stopped long enough that we also want to stop sending