Revert of move 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 2b28f4fad47169625cefcf2a85412294c8acc9f8..6b11b947265b54533a593037193ab7adbe36b8dc 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -2419,10 +2419,8 @@ TEST_F(VideoSendStreamTest, ReportsSentResolution) {
         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();