Revert of Remove deprected functions from EncodedImageCallback and RtpRtcp

webrtc/video/video_send_stream_tests.cc

Index: webrtc/video/video_send_stream_tests.cc
diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index cfe6ae125d135cf51023ac1b8ef84e799ca67995..9d00e007de2f15427e1e3c0c07f13e27c3f40709 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -2397,10 +2397,8 @@
         encoded._encodedWidth = kEncodedResolution[i].width;
         encoded._encodedHeight = kEncodedResolution[i].height;
         RTC_DCHECK(callback_);
-        if (callback_->OnEncodedImage(encoded, &specifics, nullptr).error !=
-            EncodedImageCallback::Result::OK) {
+        if (callback_->Encoded(encoded, &specifics, nullptr) != 0)
           return -1;
-        }
       }
 
       observation_complete_.Set();