Rename VideoFrameStream::ReadFrame() to Read().

TBR=scherkus@chromium.org
BUG=141788

Review URL: https://chromiumcodereview.appspot.com/18464008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211594 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 25 insertions, 26 deletions

diff --git a/media/filters/video_frame_stream.cc b/media/filters/video_frame_stream.cc
index b3e7aec..08c20fe 100644
--- a/media/filters/video_frame_stream.cc
+++ b/media/filters/video_frame_stream.cc
@@ -54,7 +54,7 @@ void VideoFrameStream::Initialize(DemuxerStream* stream,
       &VideoFrameStream::OnDecoderSelected, weak_this_));
 }
 
-void VideoFrameStream::ReadFrame(const VideoDecoder::ReadCB& read_cb) {
+void VideoFrameStream::Read(const VideoDecoder::ReadCB& read_cb) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK(state_ == STATE_NORMAL || state_ == STATE_FLUSHING_DECODER ||
          state_ == STATE_ERROR) << state_;
diff --git a/media/filters/video_frame_stream.h b/media/filters/video_frame_stream.h
index 5673cff..a231b34 100644
--- a/media/filters/video_frame_stream.h
+++ b/media/filters/video_frame_stream.h
@@ -48,8 +48,7 @@ class MEDIA_EXPORT VideoFrameStream {
   // |read_cb| is always called asynchronously. This method should only be
   // called after initialization has succeeded and must not be called during
   // any pending Reset() and/or Stop().
-  // TODO(xhwang): Rename this back to Read().
-  void ReadFrame(const VideoDecoder::ReadCB& read_cb);
+  void Read(const VideoDecoder::ReadCB& read_cb);
 
   // Resets the decoder, flushes all decoded frames and/or internal buffers,
   // fires any existing pending read callback and calls |closure| on completion.
diff --git a/media/filters/video_frame_stream_unittest.cc b/media/filters/video_frame_stream_unittest.cc
index 37c19bcc..396d589 100644
--- a/media/filters/video_frame_stream_unittest.cc
+++ b/media/filters/video_frame_stream_unittest.cc
@@ -85,7 +85,7 @@ class VideoFrameStreamTest : public testing::TestWithParam<bool> {
     decrypt_cb.Run(Decryptor::kSuccess, decrypted);
   }
 
-  // Callback for VideoFrameStream::ReadFrame().
+  // Callback for VideoFrameStream::Read().
   void FrameReady(VideoDecoder::Status status,
                   const scoped_refptr<VideoFrame>& frame) {
     DCHECK(pending_read_);
@@ -114,7 +114,7 @@ class VideoFrameStreamTest : public testing::TestWithParam<bool> {
     do {
       frame_read_ = NULL;
       pending_read_ = true;
-      video_frame_stream_->ReadFrame(base::Bind(
+      video_frame_stream_->Read(base::Bind(
           &VideoFrameStreamTest::FrameReady, base::Unretained(this)));
       message_loop_.RunUntilIdle();
     } while (!pending_read_);
@@ -235,7 +235,7 @@ class VideoFrameStreamTest : public testing::TestWithParam<bool> {
     SatisfyPendingCallback(DECODER_INIT);
   }
 
-  void ReadFrame() {
+  void Read() {
     EnterPendingState(DECODER_READ);
     SatisfyPendingCallback(DECODER_READ);
   }
@@ -279,13 +279,13 @@ TEST_P(VideoFrameStreamTest, Initialization) {
 
 TEST_P(VideoFrameStreamTest, ReadOneFrame) {
   Initialize();
-  ReadFrame();
+  Read();
 }
 
 TEST_P(VideoFrameStreamTest, ReadAllFrames) {
   Initialize();
   do {
-    ReadFrame();
+    Read();
   } while (frame_read_.get() && !frame_read_->IsEndOfStream());
 
   const int total_num_frames = kNumConfigs * kNumBuffersInOneConfig;
@@ -295,9 +295,9 @@ TEST_P(VideoFrameStreamTest, ReadAllFrames) {
 TEST_P(VideoFrameStreamTest, Read_AfterReset) {
   Initialize();
   Reset();
-  ReadFrame();
+  Read();
   Reset();
-  ReadFrame();
+  Read();
 }
 
 // No Reset() before initialization is successfully completed.
@@ -305,7 +305,7 @@ TEST_P(VideoFrameStreamTest, Read_AfterReset) {
 TEST_P(VideoFrameStreamTest, Reset_AfterInitialization) {
   Initialize();
   Reset();
-  ReadFrame();
+  Read();
 }
 
 TEST_P(VideoFrameStreamTest, Reset_DuringReinitialization) {
@@ -316,7 +316,7 @@ TEST_P(VideoFrameStreamTest, Reset_DuringReinitialization) {
   video_frame_stream_->Reset(
       base::Bind(&VideoFrameStreamTest::OnReset, base::Unretained(this)));
   SatisfyPendingCallback(DECODER_REINIT);
-  ReadFrame();
+  Read();
 }
 
 TEST_P(VideoFrameStreamTest, Reset_AfterReinitialization) {
@@ -324,7 +324,7 @@ TEST_P(VideoFrameStreamTest, Reset_AfterReinitialization) {
   EnterPendingState(DECODER_REINIT);
   SatisfyPendingCallback(DECODER_REINIT);
   Reset();
-  ReadFrame();
+  Read();
 }
 
 TEST_P(VideoFrameStreamTest, Reset_DuringDemuxerRead_Normal) {
@@ -333,7 +333,7 @@ TEST_P(VideoFrameStreamTest, Reset_DuringDemuxerRead_Normal) {
   EnterPendingState(DECODER_RESET);
   SatisfyPendingCallback(DEMUXER_READ_NORMAL);
   SatisfyPendingCallback(DECODER_RESET);
-  ReadFrame();
+  Read();
 }
 
 TEST_P(VideoFrameStreamTest, Reset_DuringDemuxerRead_ConfigChange) {
@@ -342,7 +342,7 @@ TEST_P(VideoFrameStreamTest, Reset_DuringDemuxerRead_ConfigChange) {
   EnterPendingState(DECODER_RESET);
   SatisfyPendingCallback(DEMUXER_READ_CONFIG_CHANGE);
   SatisfyPendingCallback(DECODER_RESET);
-  ReadFrame();
+  Read();
 }
 
 TEST_P(VideoFrameStreamTest, Reset_DuringNormalDecoderRead) {
@@ -351,14 +351,14 @@ TEST_P(VideoFrameStreamTest, Reset_DuringNormalDecoderRead) {
   EnterPendingState(DECODER_RESET);
   SatisfyPendingCallback(DECODER_READ);
   SatisfyPendingCallback(DECODER_RESET);
-  ReadFrame();
+  Read();
 }
 
 TEST_P(VideoFrameStreamTest, Reset_AfterNormalRead) {
   Initialize();
-  ReadFrame();
+  Read();
   Reset();
-  ReadFrame();
+  Read();
 }
 
 TEST_P(VideoFrameStreamTest, Reset_AfterDemuxerRead_ConfigChange) {
@@ -366,7 +366,7 @@ TEST_P(VideoFrameStreamTest, Reset_AfterDemuxerRead_ConfigChange) {
   EnterPendingState(DEMUXER_READ_CONFIG_CHANGE);
   SatisfyPendingCallback(DEMUXER_READ_CONFIG_CHANGE);
   Reset();
-  ReadFrame();
+  Read();
 }
 
 TEST_P(VideoFrameStreamTest, Stop_BeforeInitialization) {
@@ -429,7 +429,7 @@ TEST_P(VideoFrameStreamTest, Stop_DuringNormalDecoderRead) {
 
 TEST_P(VideoFrameStreamTest, Stop_AfterNormalRead) {
   Initialize();
-  ReadFrame();
+  Read();
   Stop();
 }
 
@@ -454,7 +454,7 @@ TEST_P(VideoFrameStreamTest, Stop_AfterReset) {
   Stop();
 }
 
-TEST_P(VideoFrameStreamTest, Stop_DuringReadFrame_DuringReset) {
+TEST_P(VideoFrameStreamTest, Stop_DuringRead_DuringReset) {
   Initialize();
   EnterPendingState(DECODER_READ);
   EnterPendingState(DECODER_RESET);
@@ -464,7 +464,7 @@ TEST_P(VideoFrameStreamTest, Stop_DuringReadFrame_DuringReset) {
   SatisfyPendingCallback(DECODER_STOP);
 }
 
-TEST_P(VideoFrameStreamTest, Stop_AfterReadFrame_DuringReset) {
+TEST_P(VideoFrameStreamTest, Stop_AfterRead_DuringReset) {
   Initialize();
   EnterPendingState(DECODER_READ);
   EnterPendingState(DECODER_RESET);
@@ -474,9 +474,9 @@ TEST_P(VideoFrameStreamTest, Stop_AfterReadFrame_DuringReset) {
   SatisfyPendingCallback(DECODER_STOP);
 }
 
-TEST_P(VideoFrameStreamTest, Stop_AfterReadFrame_AfterReset) {
+TEST_P(VideoFrameStreamTest, Stop_AfterRead_AfterReset) {
   Initialize();
-  ReadFrame();
+  Read();
   Reset();
   Stop();
 }
diff --git a/media/filters/video_renderer_base.cc b/media/filters/video_renderer_base.cc
index 694764e..3ac03d6 100644
--- a/media/filters/video_renderer_base.cc
+++ b/media/filters/video_renderer_base.cc
@@ -453,8 +453,8 @@ void VideoRendererBase::AttemptRead_Locked() {
     case kPrerolling:
     case kPlaying:
       pending_read_ = true;
-      video_frame_stream_.ReadFrame(base::Bind(&VideoRendererBase::FrameReady,
-                                               weak_this_));
+      video_frame_stream_.Read(base::Bind(&VideoRendererBase::FrameReady,
+                                          weak_this_));
       return;
 
     case kUninitialized: