Revert "Reland of Remove SendPacer from ViEEncoder

webrtc/video/encoder_state_feedback_unittest.cc

 /*
  *  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.
  */
 
 #include "webrtc/video/encoder_state_feedback.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/modules/pacing/packet_router.h"
+#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 #include "webrtc/modules/utility/include/mock/mock_process_thread.h"
 #include "webrtc/video/vie_encoder.h"
 
 using ::testing::NiceMock;
 
 namespace webrtc {
 
 class MockVieEncoder : public ViEEncoder {
  public:
-  explicit MockVieEncoder(ProcessThread* process_thread)
+  explicit MockVieEncoder(ProcessThread* process_thread, PacedSender* pacer)
       : ViEEncoder(1,
                    process_thread,
                    nullptr,
-                   nullptr) {}
+                   nullptr,
+                   nullptr,
+                   pacer) {}
   ~MockVieEncoder() {}
 
   MOCK_METHOD1(OnReceivedIntraFrameRequest, void(size_t));
   MOCK_METHOD1(OnReceivedSLI, void(uint8_t picture_id));
   MOCK_METHOD1(OnReceivedRPSI, void(uint64_t picture_id));
 };
 
 class VieKeyRequestTest : public ::testing::Test {
  public:
   VieKeyRequestTest()
-      : encoder_(&process_thread_),
+      :  pacer_(Clock::GetRealTimeClock(),
+                &router_,
+                BitrateController::kDefaultStartBitrateKbps,
+                PacedSender::kDefaultPaceMultiplier *
+                BitrateController::kDefaultStartBitrateKbps,
+                0),
+        encoder_(&process_thread_, &pacer_),
         simulated_clock_(123456789),
         encoder_state_feedback_(
             &simulated_clock_,
             std::vector<uint32_t>(1, VieKeyRequestTest::kSsrc),
             &encoder_) {}
 
  protected:
   const uint32_t kSsrc = 1234;
   NiceMock<MockProcessThread> process_thread_;
+  PacketRouter router_;
+  PacedSender pacer_;
   MockVieEncoder encoder_;
   SimulatedClock simulated_clock_;
   EncoderStateFeedback encoder_state_feedback_;
 };
 
 TEST_F(VieKeyRequestTest, CreateAndTriggerRequests) {
   EXPECT_CALL(encoder_, OnReceivedIntraFrameRequest(0)).Times(1);
   encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
 
   const uint8_t sli_picture_id = 3;
@@ skipping 13 matching lines @@
   encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
 
   EXPECT_CALL(encoder_, OnReceivedIntraFrameRequest(0)).Times(1);
   simulated_clock_.AdvanceTimeMilliseconds(300);
   encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
   encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
   encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
 }
 
 }  // namespace webrtc