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

media/filters/video_renderer_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/video_renderer_base.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 313 matching lines @@
   ready_frames_.pop_front();
 
   PipelineStatistics statistics;
   statistics.video_frames_dropped = 1;
   statistics_cb_.Run(statistics);
 
   message_loop_->PostTask(FROM_HERE, base::Bind(
       &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);
   DCHECK_NE(state_, kFlushed);
 
   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()) {
       base::ResetAndReturn(&preroll_cb_).Run(error);
       return;
     }
 
     error_cb_.Run(error);
     return;
   }
@@ skipping 155 matching lines @@
   // Because we might remain in the prerolled state for an undetermined amount
   // of time (e.g., we seeked while paused), we'll paint the first prerolled
   // frame.
   if (!ready_frames_.empty())
     PaintNextReadyFrame_Locked();
 
   base::ResetAndReturn(&preroll_cb_).Run(PIPELINE_OK);
 }
 
 }  // namespace media