Reland r212023 "Rename VideoDecoder::ReadCB to VideoDecoder::DecodeCB."

media/filters/video_renderer_base.cc

Index: media/filters/video_renderer_base.cc
diff --git a/media/filters/video_renderer_base.cc b/media/filters/video_renderer_base.cc
index da330738d80aa1dc1290fd97e8140d112d87cdf4..806bb4a2fb8b8cbebae0c8ac164aba56a0b6f9ab 100644
--- a/media/filters/video_renderer_base.cc
+++ b/media/filters/video_renderer_base.cc
@@ -331,7 +331,7 @@ void VideoRendererBase::DropNextReadyFrame_Locked() {
       &VideoRendererBase::AttemptRead, weak_this_));
 }
 
-void VideoRendererBase::FrameReady(VideoDecoder::Status status,
+void VideoRendererBase::FrameReady(VideoFrameStream::Status status,
                                    const scoped_refptr<VideoFrame>& frame) {
   base::AutoLock auto_lock(lock_);
   DCHECK_NE(state_, kUninitialized);
@@ -340,10 +340,11 @@ void VideoRendererBase::FrameReady(VideoDecoder::Status status,
   CHECK(pending_read_);
   pending_read_ = false;
 
-  if (status != VideoDecoder::kOk) {
+  if (status == VideoFrameStream::DECODE_ERROR ||
+      status == VideoFrameStream::DECRYPT_ERROR) {
     DCHECK(!frame.get());
     PipelineStatus error = PIPELINE_ERROR_DECODE;
-    if (status == VideoDecoder::kDecryptError)
+    if (status == VideoFrameStream::DECRYPT_ERROR)
       error = PIPELINE_ERROR_DECRYPT;
 
     if (!preroll_cb_.is_null()) {