Revert of Deprecate VCMPacketizationCallback::SendData and use EncodedImageCallback instead.

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.
  */
 
@@ skipping 17 matching lines @@
 class MockVieEncoder : public ViEEncoder {
  public:
   explicit MockVieEncoder(ProcessThread* process_thread, PacedSender* pacer)
       : ViEEncoder(1,
                    std::vector<uint32_t>(),
                    process_thread,
                    nullptr,
                    nullptr,
                    nullptr,
                    pacer,
-                   nullptr,
                    nullptr) {}
   ~MockVieEncoder() {}
 
   MOCK_METHOD1(OnReceivedIntraFrameRequest,
                void(uint32_t));
   MOCK_METHOD2(OnReceivedSLI,
                void(uint32_t ssrc, uint8_t picture_id));
   MOCK_METHOD2(OnReceivedRPSI,
                void(uint32_t ssrc, uint64_t picture_id));
 };
@@ skipping 21 matching lines @@
       .Times(1);
   encoder_state_feedback.OnReceivedSLI(kSsrc, sli_picture_id);
 
   const uint64_t rpsi_picture_id = 9;
   EXPECT_CALL(encoder, OnReceivedRPSI(kSsrc, rpsi_picture_id))
       .Times(1);
   encoder_state_feedback.OnReceivedRPSI(kSsrc, rpsi_picture_id);
 }
 
 }  // namespace webrtc