Revert of move deprected functions from EncodedImageCallback and RtpRtcp

webrtc/video/vie_encoder_unittest.cc

Index: webrtc/video/vie_encoder_unittest.cc
diff --git a/webrtc/video/vie_encoder_unittest.cc b/webrtc/video/vie_encoder_unittest.cc
index 9f4fdc47e33094d3577dbe4f05eb226bfb37a173..895109773f16a0837742c6730e2523143f3d1afb 100644
--- a/webrtc/video/vie_encoder_unittest.cc
+++ b/webrtc/video/vie_encoder_unittest.cc
@@ -208,15 +208,14 @@ class ViEEncoderTest : public ::testing::Test {
     }
 
    private:
-    Result OnEncodedImage(
-        const EncodedImage& encoded_image,
-        const CodecSpecificInfo* codec_specific_info,
-        const RTPFragmentationHeader* fragmentation) override {
+    int32_t Encoded(const EncodedImage& encoded_image,
+                    const CodecSpecificInfo* codec_specific_info,
+                    const RTPFragmentationHeader* fragmentation) override {
       rtc::CritScope lock(&crit_);
       EXPECT_TRUE(expect_frames_);
       timestamp_ = encoded_image._timeStamp;
       encoded_frame_event_.Set();
-      return Result(Result::OK, timestamp_);
+      return 0;
     }
 
     void OnEncoderConfigurationChanged(std::vector<VideoStream> streams,