commit 04afc1ff659c9887ef7bd841c14ed557867c83fb
author Danil Chapovalov <danilchap@webrtc.org> Tue Aug 11 10:20:49 2020
committer Commit Bot <commit-bot@chromium.org> Wed Aug 12 14:41:00 2020
tree 79caca6beaab595daeeadd0c2f1c6c07f831423c
parent 383f2cfca4a1ebd9626134101fe70d5a716b2d92

Delete legacy MockEncodedImageCallback::OnEncodedFrame

Bug: webrtc:6471
Change-Id: I633965487e0eb9ed03934179c41cd66fdfff7359
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181261
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31922}

api/test/mock_video_encoder.h

diff --git a/api/test/mock_video_encoder.h b/api/test/mock_video_encoder.h
index b4ae271..11e0f64 100644
--- a/api/test/mock_video_encoder.h
+++ b/api/test/mock_video_encoder.h
@@ -22,12 +22,6 @@
  public:
   MOCK_METHOD(Result,
               OnEncodedImage,
-              (const EncodedImage& encodedImage,
-               const CodecSpecificInfo*,
-               const RTPFragmentationHeader*),
-              (override));
-  MOCK_METHOD(Result,
-              OnEncodedImage,
               (const EncodedImage&, const CodecSpecificInfo*),
               (override));
   MOCK_METHOD(void, OnDroppedFrame, (DropReason reason), (override));

modules/video_coding/utility/simulcast_test_fixture_impl.cc

diff --git a/modules/video_coding/utility/simulcast_test_fixture_impl.cc b/modules/video_coding/utility/simulcast_test_fixture_impl.cc
index f4e0294..93d6fb7 100644
--- a/modules/video_coding/utility/simulcast_test_fixture_impl.cc
+++ b/modules/video_coding/utility/simulcast_test_fixture_impl.cc
@@ -75,8 +75,7 @@
   }
 
   Result OnEncodedImage(const EncodedImage& encoded_image,
-                        const CodecSpecificInfo* codec_specific_info,
-                        const RTPFragmentationHeader* fragmentation) override {
+                        const CodecSpecificInfo* codec_specific_info) override {
     bool is_vp8 = (codec_specific_info->codecType == kVideoCodecVP8);
     bool is_h264 = (codec_specific_info->codecType == kVideoCodecH264);
     // Only store the base layer.
@@ -352,7 +351,7 @@
             AllOf(Field(&EncodedImage::_frameType, frame_type),
                   Field(&EncodedImage::_encodedWidth, kDefaultWidth / 4),
                   Field(&EncodedImage::_encodedHeight, kDefaultHeight / 4)),
-            _, _))
+            _))
         .Times(1)
         .WillRepeatedly(Return(
             EncodedImageCallback::Result(EncodedImageCallback::Result::OK, 0)));
@@ -364,7 +363,7 @@
             AllOf(Field(&EncodedImage::_frameType, frame_type),
                   Field(&EncodedImage::_encodedWidth, kDefaultWidth / 2),
                   Field(&EncodedImage::_encodedHeight, kDefaultHeight / 2)),
-            _, _))
+            _))
         .Times(1)
         .WillRepeatedly(Return(
             EncodedImageCallback::Result(EncodedImageCallback::Result::OK, 0)));
@@ -375,7 +374,7 @@
                     AllOf(Field(&EncodedImage::_frameType, frame_type),
                           Field(&EncodedImage::_encodedWidth, kDefaultWidth),
                           Field(&EncodedImage::_encodedHeight, kDefaultHeight)),
-                    _, _))
+                    _))
         .Times(1)
         .WillRepeatedly(Return(
             EncodedImageCallback::Result(EncodedImageCallback::Result::OK, 0)));
@@ -643,7 +642,7 @@
                                  VideoFrameType::kVideoFrameKey),
                            Field(&EncodedImage::_encodedWidth, width),
                            Field(&EncodedImage::_encodedHeight, height)),
-                     _, _))
+                     _))
       .Times(1)
       .WillRepeatedly(Return(
           EncodedImageCallback::Result(EncodedImageCallback::Result::OK, 0)));
@@ -866,12 +865,11 @@
   encoder_->RegisterEncodeCompleteCallback(&encoder_callback);
   decoder_->RegisterDecodeCompleteCallback(&decoder_callback);
 
-  EXPECT_CALL(encoder_callback, OnEncodedImage(_, _, _))
+  EXPECT_CALL(encoder_callback, OnEncodedImage(_, _))
       .Times(3)
       .WillRepeatedly(
           ::testing::Invoke([&](const EncodedImage& encoded_image,
-                                const CodecSpecificInfo* codec_specific_info,
-                                const RTPFragmentationHeader* fragmentation) {
+                                const CodecSpecificInfo* codec_specific_info) {
             EXPECT_EQ(encoded_image._frameType, VideoFrameType::kVideoFrameKey);
 
             size_t index = encoded_image.SpatialIndex().value_or(0);