Revert of Add EncodedImageCallback::OnEncodedImage().

webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc

Index: webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
diff --git a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
index 12dcb7cfc1dfe13f14daf79ec37178aadd1c611b..756a102b1c1d0aba1f54d8aa754224bda8ba2b43 100644
--- a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
+++ b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
@@ -43,9 +43,9 @@
                                     void* decoderSpecificInfo)
       : encoded_frame_(frame), encode_complete_(false) {}
 
-  Result OnEncodedImage(const EncodedImage& encoded_frame_,
-                        const CodecSpecificInfo* codec_specific_info,
-                        const RTPFragmentationHeader* fragmentation) override;
+  virtual int Encoded(const EncodedImage& encoded_frame_,
+                      const CodecSpecificInfo* codecSpecificInfo,
+                      const RTPFragmentationHeader*);
   bool EncodeComplete();
 
  private:
@@ -54,10 +54,9 @@
   bool encode_complete_;
 };
 
-webrtc::EncodedImageCallback::Result
-Vp8UnitTestEncodeCompleteCallback::OnEncodedImage(
+int Vp8UnitTestEncodeCompleteCallback::Encoded(
     const EncodedImage& encoded_frame,
-    const CodecSpecificInfo* codec_specific_info,
+    const CodecSpecificInfo* codecSpecificInfo,
     const RTPFragmentationHeader* fragmentation) {
   if (encoded_frame_->_size < encoded_frame._length) {
     delete[] encoded_frame_->_buffer;
@@ -73,7 +72,7 @@
   encoded_frame_->_frameType = encoded_frame._frameType;
   encoded_frame_->_completeFrame = encoded_frame._completeFrame;
   encode_complete_ = true;
-  return Result(Result::OK, 0);
+  return 0;
 }
 
 bool Vp8UnitTestEncodeCompleteCallback::EncodeComplete() {