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

webrtc/modules/pacing/packet_router.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 12 matching lines @@
 
 namespace webrtc {
 
 class RtpRtcp;
 namespace rtcp {
 class TransportFeedback;
 }  // namespace rtcp
 
 // PacketRouter routes outgoing data to the correct sending RTP module, based
 // on the simulcast layer in RTPVideoHeader.
-class PacketRouter : public PacedSender::Callback,
+class PacketRouter : public PacedSender::PacketSender,
                      public TransportSequenceNumberAllocator {
  public:
   PacketRouter();
   virtual ~PacketRouter();
 
   void AddRtpModule(RtpRtcp* rtp_module);
   void RemoveRtpModule(RtpRtcp* rtp_module);
 
   // Implements PacedSender::Callback.
   bool TimeToSendPacket(uint32_t ssrc,
@@ skipping 13 matching lines @@
   rtc::ThreadChecker pacer_thread_checker_;
   rtc::CriticalSection modules_crit_;
   std::list<RtpRtcp*> rtp_modules_ GUARDED_BY(modules_crit_);
 
   volatile int transport_seq_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(PacketRouter);
 };
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_PACING_PACKET_ROUTER_H_