Revert of Remove 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 4cf45688c68b23ce48af32b7e19101cd4bffce6c..ac1c6dec691ea2f4522722e160dbabd5c988f529 100644
--- a/webrtc/test/fake_encoder.cc
+++ b/webrtc/test/fake_encoder.cc
@@ -111,10 +111,8 @@
     encoded._encodedHeight = config_.simulcastStream[i].height;
     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;