Revert "Reland of Remove SendPacer from ViEEncoder

webrtc/modules/remote_bitrate_estimator/test/packet_sender.h

 /*
  *  Copyright (c) 2015 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 82 matching lines @@
   VideoSource* source_;
   std::unique_ptr<BweSender> bwe_;
   int64_t start_of_run_ms_;
   std::list<Module*> modules_;
 
  private:
   uint32_t previous_sending_bitrate_;
   RTC_DISALLOW_COPY_AND_ASSIGN(VideoSender);
 };
 
-class PacedVideoSender : public VideoSender, public PacedSender::PacketSender {
+class PacedVideoSender : public VideoSender, public PacedSender::Callback {
  public:
   PacedVideoSender(PacketProcessorListener* listener,
                    VideoSource* source,
                    BandwidthEstimatorType estimator);
   virtual ~PacedVideoSender();
 
   void RunFor(int64_t time_ms, Packets* in_out) override;
 
   // Implements PacedSender::Callback.
   bool TimeToSendPacket(uint32_t ssrc,
@@ skipping 72 matching lines @@
   int total_sent_bytes_;
   int send_limit_bytes_;  // Initialized by default as kNoLimit.
   int64_t last_generated_packets_ms_;
   size_t num_recent_sent_packets_;
   uint32_t bitrate_kbps_;
 };
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_SENDER_H_