Revert of Remove deprected functions from EncodedImageCallback and RtpRtcp

webrtc/video/vie_encoder_unittest.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 144 matching lines @@
       rtc::CritScope lock(&crit_);
       return number_of_reconfigurations_;
     }
 
     int last_min_transmit_bitrate() {
       rtc::CritScope lock(&crit_);
       return min_transmit_bitrate_bps_;
     }
 
    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,
                                        int min_transmit_bitrate_bps) override {
       rtc::CriticalSection crit_;
       ++number_of_reconfigurations_;
       min_transmit_bitrate_bps_ = min_transmit_bitrate_bps;
     }
 
     rtc::CriticalSection crit_;
@@ skipping 145 matching lines @@
   video_source_.IncomingCapturedFrame(CreateFrame(2, nullptr));
   sink_.WaitForEncodedFrame(2);
   EXPECT_EQ(codec_width_, fake_encoder_.codec_config().width);
   EXPECT_EQ(codec_height_, fake_encoder_.codec_config().height);
   EXPECT_EQ(3, sink_.number_of_reconfigurations());
 
   vie_encoder_->Stop();
 }
 
 }  // namespace webrtc