Reland of Remove SendPacer from ViEEncoder (patchset #13 id:240001 of https://codereview.we…

webrtc/video/vie_encoder.h

 /*
  *  Copyright (c) 2012 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 43 matching lines @@
 class ViEEncoder : public VideoEncoderRateObserver,
                    public EncodedImageCallback,
                    public VCMSendStatisticsCallback {
  public:
   friend class ViEBitrateObserver;
 
   ViEEncoder(uint32_t number_of_cores,
              const std::vector<uint32_t>& ssrcs,
              ProcessThread* module_process_thread,
              SendStatisticsProxy* stats_proxy,
-             // TODO(nisse): Used only for tests, delete?
-             rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback,
-             OveruseFrameDetector* overuse_detector,
-             PacedSender* pacer);
+             OveruseFrameDetector* overuse_detector);
   ~ViEEncoder();
 
   vcm::VideoSender* video_sender();
 
   void SetNetworkTransmissionState(bool is_transmitting);
 
   // Returns the id of the owning channel.
   int Owner() const;
 
   void Start();
@@ skipping 54 matching lines @@
   const uint32_t number_of_cores_;
   const std::vector<uint32_t> ssrcs_;
 
   const std::unique_ptr<VideoProcessing> vp_;
   const std::unique_ptr<QMVideoSettingsCallback> qm_callback_;
   vcm::VideoSender video_sender_;
 
   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
   // padding.
   int64_t time_of_last_frame_activity_ms_ GUARDED_BY(data_cs_);
   VideoCodec encoder_config_ GUARDED_BY(data_cs_);
   int min_transmit_bitrate_bps_ GUARDED_BY(data_cs_);
   uint32_t last_observed_bitrate_bps_ GUARDED_BY(data_cs_);
   bool network_is_transmitting_ GUARDED_BY(data_cs_);
   bool encoder_paused_ GUARDED_BY(data_cs_);
@@ skipping 11 matching lines @@
   uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_);
 
   bool video_suspended_ GUARDED_BY(data_cs_);
 
   std::unique_ptr<IvfFileWriter> file_writers_[kMaxLayers] GUARDED_BY(data_cs_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIE_ENCODER_H_