| Index: webrtc/modules/video_render/android/video_render_android_impl.h
 | 
| diff --git a/webrtc/modules/video_render/android/video_render_android_impl.h b/webrtc/modules/video_render/android/video_render_android_impl.h
 | 
| index 06fd7a1c7cdf05b139988298e0db4c4896a9191f..1ab7af1936c4c29c0e5fdde28953a8efbf5fb142 100644
 | 
| --- a/webrtc/modules/video_render/android/video_render_android_impl.h
 | 
| +++ b/webrtc/modules/video_render/android/video_render_android_impl.h
 | 
| @@ -30,7 +30,7 @@ class EventWrapper;
 | 
|  // The object a module user uses to send new frames to the java renderer
 | 
|  // Base class for android render streams.
 | 
|  
 | 
| -class AndroidStream : public VideoRenderCallback {
 | 
| +class AndroidStream : public rtc::VideoSinkInterface<VideoFrame> {
 | 
|   public:
 | 
|    // DeliverFrame is called from a thread connected to the Java VM.
 | 
|    // Used for Delivering frame for rendering.
 | 
| @@ -52,7 +52,7 @@ class VideoRenderAndroid: IVideoRender {
 | 
|  
 | 
|    virtual int32_t ChangeWindow(void* window);
 | 
|  
 | 
| -  virtual VideoRenderCallback* AddIncomingRenderStream(
 | 
| +  virtual rtc::VideoSinkInterface<VideoFrame>* AddIncomingRenderStream(
 | 
|        const uint32_t streamId,
 | 
|        const uint32_t zOrder,
 | 
|        const float left, const float top,
 | 
| 
 |