Revert "Reland of Remove SendPacer from ViEEncoder

webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc

 /*
  *  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 139 matching lines @@
 }
 
 uint32_t VideoSender::TargetBitrateKbps() {
   return (source_->bits_per_second() + 500) / 1000;
 }
 
 PacedVideoSender::PacedVideoSender(PacketProcessorListener* listener,
                                    VideoSource* source,
                                    BandwidthEstimatorType estimator)
     : VideoSender(listener, source, estimator),
-      pacer_(&clock_, this, source->bits_per_second()) {
+      pacer_(&clock_,
+             this,
+             source->bits_per_second() / 1000,
+             PacedSender::kDefaultPaceMultiplier * source->bits_per_second() /
+                 1000,
+             0) {
   modules_.push_back(&pacer_);
 }
 
 PacedVideoSender::~PacedVideoSender() {
   for (Packet* packet : pacer_queue_)
     delete packet;
   for (Packet* packet : queue_)
     delete packet;
 }
 
@@ skipping 127 matching lines @@
 }
 
 size_t PacedVideoSender::TimeToSendPadding(size_t bytes) {
   return 0;
 }
 
 void PacedVideoSender::OnNetworkChanged(uint32_t target_bitrate_bps,
                                         uint8_t fraction_lost,
                                         int64_t rtt) {
   VideoSender::OnNetworkChanged(target_bitrate_bps, fraction_lost, rtt);
-  pacer_.SetEstimatedBitrate(target_bitrate_bps);
+  pacer_.UpdateBitrate(
+      target_bitrate_bps / 1000,
+      PacedSender::kDefaultPaceMultiplier * target_bitrate_bps / 1000, 0);
 }
 
 const int kNoLimit = std::numeric_limits<int>::max();
 const int kPacketSizeBytes = 1200;
 
 TcpSender::TcpSender(PacketProcessorListener* listener,
                      int flow_id,
                      int64_t offset_ms)
     : TcpSender(listener, flow_id, offset_ms, kNoLimit) {
 }
@@ skipping 159 matching lines @@
   RecordBitrate();
 }
 
 uint32_t TcpSender::TargetBitrateKbps() {
   return bitrate_kbps_;
 }
 
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc