Remove EncodedFrameCallbackAdapter.

webrtc/video/video_send_stream.cc

Index: webrtc/video/video_send_stream.cc
diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc
index 1c2a6423c16461d36bf337a5b24677233befc534..b9f306d2ddeb3216d52f86f27035a576c447a59a 100644
--- a/webrtc/video/video_send_stream.cc
+++ b/webrtc/video/video_send_stream.cc
@@ -362,7 +362,6 @@ VideoSendStream::VideoSendStream(
     : stats_proxy_(Clock::GetRealTimeClock(),
                    config,
                    encoder_config.content_type),
-      encoded_frame_proxy_(config.post_encode_callback),
       config_(config),
       suspended_ssrcs_(suspended_ssrcs),
       module_process_thread_(module_process_thread),
@@ -630,9 +629,12 @@ void VideoSendStream::NormalUsage() {
 int32_t VideoSendStream::Encoded(const EncodedImage& encoded_image,
                                  const CodecSpecificInfo* codec_specific_info,
                                  const RTPFragmentationHeader* fragmentation) {
-  // |encoded_frame_proxy_| forwards frames to |config_.post_encode_callback|;
-  encoded_frame_proxy_.Encoded(encoded_image, codec_specific_info,
-                               fragmentation);
+  if (config_.post_encode_callback) {
+    config_.post_encode_callback->EncodedFrameCallback(
+        EncodedFrame(encoded_image._buffer, encoded_image._length,
+                     encoded_image._frameType));
+  }
+
   protection_bitrate_calculator_.UpdateWithEncodedData(encoded_image);
   int32_t return_value = payload_router_.Encoded(
       encoded_image, codec_specific_info, fragmentation);