Deletes the class VideoRendererCallback.

webrtc/modules/video_render/video_render_impl.cc

Index: webrtc/modules/video_render/video_render_impl.cc
diff --git a/webrtc/modules/video_render/video_render_impl.cc b/webrtc/modules/video_render/video_render_impl.cc
index 75403f8dd537ac763536e878f7205ae1790089fd..77ab3d57f86a0eedf7181c20626d3b889171400e 100644
--- a/webrtc/modules/video_render/video_render_impl.cc
+++ b/webrtc/modules/video_render/video_render_impl.cc
@@ -157,7 +157,7 @@ uint32_t ModuleVideoRenderImpl::GetIncomingFrameRate(const uint32_t streamId) {
   return it->second->IncomingRate();
 }
 
-VideoRenderCallback*
+rtc::VideoSinkInterface<VideoFrame>*
 ModuleVideoRenderImpl::AddIncomingRenderStream(const uint32_t streamId,
                                                const uint32_t zOrder,
                                                const float left,
@@ -181,7 +181,7 @@ ModuleVideoRenderImpl::AddIncomingRenderStream(const uint32_t streamId,
         return NULL;
     }
 
-    VideoRenderCallback* ptrRenderCallback =
+    rtc::VideoSinkInterface<VideoFrame>* ptrRenderCallback =
             _ptrRenderer->AddIncomingRenderStream(streamId, zOrder, left, top,
                                                   right, bottom);
     if (ptrRenderCallback == NULL)
@@ -194,9 +194,10 @@ ModuleVideoRenderImpl::AddIncomingRenderStream(const uint32_t streamId,
 
     // Create platform independant code
     IncomingVideoStream* ptrIncomingStream =
-        new IncomingVideoStream(streamId, false);
+        new IncomingVideoStream(false);
     ptrIncomingStream->SetRenderCallback(ptrRenderCallback);
-    VideoRenderCallback* moduleCallback = ptrIncomingStream->ModuleCallback();
+    rtc::VideoSinkInterface<VideoFrame>* moduleCallback =
+        ptrIncomingStream->ModuleCallback();
 
     // Store the stream
     _streamRenderMap[streamId] = ptrIncomingStream;
@@ -235,7 +236,7 @@ int32_t ModuleVideoRenderImpl::DeleteIncomingRenderStream(
 
 int32_t ModuleVideoRenderImpl::AddExternalRenderCallback(
     const uint32_t streamId,
-    VideoRenderCallback* renderObject) {
+    rtc::VideoSinkInterface<VideoFrame>* renderObject) {
     CriticalSectionScoped cs(&_moduleCrit);
 
     IncomingVideoStreamMap::iterator item = _streamRenderMap.find(streamId);
@@ -293,7 +294,7 @@ bool ModuleVideoRenderImpl::HasIncomingRenderStream(
 
 int32_t ModuleVideoRenderImpl::RegisterRawFrameCallback(
     const uint32_t streamId,
-    VideoRenderCallback* callbackObj) {
+    rtc::VideoSinkInterface<VideoFrame>* callbackObj) {
   return -1;
 }