Revert of move deprected functions from EncodedImageCallback and RtpRtcp

webrtc/test/fake_encoder.cc

Index: webrtc/test/fake_encoder.cc
diff --git a/webrtc/test/fake_encoder.cc b/webrtc/test/fake_encoder.cc
index f518ce39192adaca53f2541768b4a7a05648f2bf..065b5299cd2b8a3012e006862b516b4541c26bd7 100644
--- a/webrtc/test/fake_encoder.cc
+++ b/webrtc/test/fake_encoder.cc
@@ -112,10 +112,8 @@ int32_t FakeEncoder::Encode(const VideoFrame& input_image,
     encoded.rotation_ = input_image.rotation();
     RTC_DCHECK(callback_ != NULL);
     specifics.codec_name = ImplementationName();
-    if (callback_->OnEncodedImage(encoded, &specifics, NULL).error !=
-        EncodedImageCallback::Result::OK) {
+    if (callback_->Encoded(encoded, &specifics, NULL) != 0)
       return -1;
-    }
     bits_available -= std::min(encoded._length * 8, bits_available);
   }
   return 0;