| Index: webrtc/video/video_receive_stream.h
 | 
| diff --git a/webrtc/video/video_receive_stream.h b/webrtc/video/video_receive_stream.h
 | 
| index 3aca570f99e9d3a96d19a0abc2f56f547029cd44..d4e07b6f537db5de6f8afe0bbe558afbc21b76f7 100644
 | 
| --- a/webrtc/video/video_receive_stream.h
 | 
| +++ b/webrtc/video/video_receive_stream.h
 | 
| @@ -39,7 +39,7 @@ namespace internal {
 | 
|  
 | 
|  class VideoReceiveStream : public webrtc::VideoReceiveStream,
 | 
|                             public I420FrameCallback,
 | 
| -                           public VideoRenderCallback,
 | 
| +                           public rtc::VideoSinkInterface<VideoFrame>,
 | 
|                             public EncodedImageCallback,
 | 
|                             public NackSender,
 | 
|                             public KeyFrameRequestSender {
 | 
| @@ -68,9 +68,8 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
 | 
|    // Overrides I420FrameCallback.
 | 
|    void FrameCallback(VideoFrame* video_frame) override;
 | 
|  
 | 
| -  // Overrides VideoRenderCallback.
 | 
| -  int RenderFrame(const uint32_t /*stream_id*/,
 | 
| -                  const VideoFrame& video_frame) override;
 | 
| +  // Overrides rtc::VideoSinkInterface<VideoFrame>.
 | 
| +  void OnFrame(const VideoFrame& video_frame) override;
 | 
|  
 | 
|    // Overrides EncodedImageCallback.
 | 
|    int32_t Encoded(const EncodedImage& encoded_image,
 | 
| 
 |