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

webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc

 /*
  *  Copyright (c) 2016 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 85 matching lines @@
           ByteReader<uint64_t>::ReadLittleEndian(&frame_header[4]);
       EXPECT_EQ(i, timestamp);
 
       uint8_t data[kMaxFrameSize] = {};
       ASSERT_EQ(frame_length,
                 static_cast<uint32_t>(file->Read(data, frame_length)));
       EXPECT_EQ(0, memcmp(data, dummy_payload, frame_length));
     }
   }
 
-  void RunBasicFileStructureTest(VideoCodecType codec_type,
+  void RunBasicFileStructureTest(RtpVideoCodecTypes codec_type,
                                  const uint8_t fourcc[4],
                                  bool use_capture_tims_ms) {
     file_writer_ = IvfFileWriter::Open(file_name_, codec_type);
     ASSERT_TRUE(file_writer_.get());
     const int kWidth = 320;
     const int kHeight = 240;
     const int kNumFrames = 257;
     EXPECT_TRUE(
         WriteDummyTestFrames(kWidth, kHeight, kNumFrames, use_capture_tims_ms));
     EXPECT_TRUE(file_writer_->Close());
@@ skipping 11 matching lines @@
   bool FileExists() {
     std::unique_ptr<FileWrapper> file_wrapper(FileWrapper::Create());
     return file_wrapper->OpenFile(file_name_.c_str(), true) == 0;
   }
 
   std::string file_name_;
   std::unique_ptr<IvfFileWriter> file_writer_;
 };
 
 TEST_F(IvfFileWriterTest, RemovesUnusedFile) {
-  file_writer_ = IvfFileWriter::Open(file_name_, kVideoCodecVP8);
+  file_writer_ = IvfFileWriter::Open(file_name_, kRtpVideoVp8);
   ASSERT_TRUE(file_writer_.get() != nullptr);
   EXPECT_TRUE(FileExists());
   EXPECT_TRUE(file_writer_->Close());
   EXPECT_FALSE(FileExists());
   EXPECT_FALSE(file_writer_->Close());  // Can't close twice.
 }
 
 TEST_F(IvfFileWriterTest, WritesBasicVP8FileNtpTimestamp) {
   const uint8_t fourcc[4] = {'V', 'P', '8', '0'};
-  RunBasicFileStructureTest(kVideoCodecVP8, fourcc, false);
+  RunBasicFileStructureTest(kRtpVideoVp8, fourcc, false);
 }
 
 TEST_F(IvfFileWriterTest, WritesBasicVP8FileMsTimestamp) {
   const uint8_t fourcc[4] = {'V', 'P', '8', '0'};
-  RunBasicFileStructureTest(kVideoCodecVP8, fourcc, true);
+  RunBasicFileStructureTest(kRtpVideoVp8, fourcc, true);
 }
 
 TEST_F(IvfFileWriterTest, WritesBasicVP9FileNtpTimestamp) {
   const uint8_t fourcc[4] = {'V', 'P', '9', '0'};
-  RunBasicFileStructureTest(kVideoCodecVP9, fourcc, false);
+  RunBasicFileStructureTest(kRtpVideoVp9, fourcc, false);
 }
 
 TEST_F(IvfFileWriterTest, WritesBasicVP9FileMsTimestamp) {
   const uint8_t fourcc[4] = {'V', 'P', '9', '0'};
-  RunBasicFileStructureTest(kVideoCodecVP9, fourcc, true);
+  RunBasicFileStructureTest(kRtpVideoVp9, fourcc, true);
 }
 
 TEST_F(IvfFileWriterTest, WritesBasicH264FileNtpTimestamp) {
   const uint8_t fourcc[4] = {'H', '2', '6', '4'};
-  RunBasicFileStructureTest(kVideoCodecH264, fourcc, false);
+  RunBasicFileStructureTest(kRtpVideoH264, fourcc, false);
 }
 
 TEST_F(IvfFileWriterTest, WritesBasicH264FileMsTimestamp) {
   const uint8_t fourcc[4] = {'H', '2', '6', '4'};
-  RunBasicFileStructureTest(kVideoCodecH264, fourcc, true);
+  RunBasicFileStructureTest(kRtpVideoH264, fourcc, true);
 }
 
 }  // namespace webrtc