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

media/filters/video_renderer_base.h

 // 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.
 
 #ifndef MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_
 #define MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_
 
 #include <deque>
 
 #include "base/memory/ref_counted.h"
@@ skipping 71 matching lines @@
 
   // PlatformThread::Delegate implementation.
   virtual void ThreadMain() OVERRIDE;
 
  private:
   // Callback for |video_frame_stream_| initialization.
   void OnVideoFrameStreamInitialized(bool success, bool has_alpha);
 
   // Callback for |video_frame_stream_| to deliver decoded video frames and
   // report video decoding status.
-  void FrameReady(VideoDecoder::Status status,
+  void FrameReady(VideoFrameStream::Status status,
                   const scoped_refptr<VideoFrame>& frame);
 
   // Helper method for adding a frame to |ready_frames_|.
   void AddReadyFrame_Locked(const scoped_refptr<VideoFrame>& frame);
 
   // Helper method that schedules an asynchronous read from the
   // |video_frame_stream_| as long as there isn't a pending read and we have
   // capacity.
   void AttemptRead();
   void AttemptRead_Locked();
@@ skipping 132 matching lines @@
   // either for calling |paint_cb_| or for dropping. Set to kNoTimestamp()
   // during flushing.
   base::TimeDelta last_timestamp_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoRendererBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_