Revert of Add EncodedImageCallback::OnEncodedImage().

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

 /*
  *  Copyright (c) 2012 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 25 matching lines @@
 static const int64_t kTestNtpTimeMs = 456;
 
 // TODO(mikhal): Replace these with mocks.
 class Vp8UnitTestEncodeCompleteCallback : public webrtc::EncodedImageCallback {
  public:
   Vp8UnitTestEncodeCompleteCallback(EncodedImage* frame,
                                     unsigned int decoderSpecificSize,
                                     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:
   EncodedImage* const encoded_frame_;
   std::unique_ptr<uint8_t[]> frame_buffer_;
   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;
     frame_buffer_.reset(new uint8_t[encoded_frame._length]);
     encoded_frame_->_buffer = frame_buffer_.get();
     encoded_frame_->_size = encoded_frame._length;
   }
   memcpy(encoded_frame_->_buffer, encoded_frame._buffer, encoded_frame._length);
   encoded_frame_->_length = encoded_frame._length;
   encoded_frame_->_encodedWidth = encoded_frame._encodedWidth;
   encoded_frame_->_encodedHeight = encoded_frame._encodedHeight;
   encoded_frame_->_timeStamp = encoded_frame._timeStamp;
   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() {
   if (encode_complete_) {
     encode_complete_ = false;
     return true;
   }
   return false;
 }
 
@@ skipping 183 matching lines @@
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_ERROR,
             decoder_->Decode(encoded_frame_, false, NULL));
   // Now setting a key frame.
   encoded_frame_._frameType = kVideoFrameKey;
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
             decoder_->Decode(encoded_frame_, false, NULL));
   EXPECT_GT(I420PSNR(&input_frame_, &decoded_frame_), 36);
 }
 
 }  // namespace webrtc