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

media/filters/video_frame_stream_unittest.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 "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "media/base/gmock_callback_support.h"
 #include "media/base/mock_filters.h"
 #include "media/base/test_helpers.h"
@@ skipping 60 matching lines @@
 
     if (is_initialized_)
       Stop();
     EXPECT_FALSE(is_initialized_);
   }
 
   MOCK_METHOD1(SetDecryptorReadyCallback, void(const media::DecryptorReadyCB&));
   MOCK_METHOD2(OnInitialized, void(bool, bool));
 
   void OnStatistics(const PipelineStatistics& statistics) {
-     total_bytes_decoded_ += statistics.video_bytes_decoded;
+    total_bytes_decoded_ += statistics.video_bytes_decoded;
   }
 
   // Fake Decrypt() function used by DecryptingDemuxerStream. It does nothing
   // but removes the DecryptConfig to make the buffer unencrypted.
   void Decrypt(Decryptor::StreamType stream_type,
                const scoped_refptr<DecoderBuffer>& encrypted,
                const Decryptor::DecryptCB& decrypt_cb) {
     DCHECK_EQ(stream_type, Decryptor::kVideo);
     scoped_refptr<DecoderBuffer> decrypted = DecoderBuffer::CopyFrom(
         encrypted->data(), encrypted->data_size());
     decrypted->set_timestamp(encrypted->timestamp());
     decrypted->set_duration(encrypted->duration());
     decrypt_cb.Run(Decryptor::kSuccess, decrypted);
   }
 
   // Callback for VideoFrameStream::Read().
-  void FrameReady(VideoDecoder::Status status,
+  void FrameReady(VideoFrameStream::Status status,
                   const scoped_refptr<VideoFrame>& frame) {
     DCHECK(pending_read_);
-    ASSERT_EQ(VideoDecoder::kOk, status);
+    // TODO(xhwang): Add test cases where the fake decoder returns error or
+    // the fake demuxer aborts demuxer read.
+    ASSERT_TRUE(status == VideoFrameStream::OK ||
+                status == VideoFrameStream::ABORTED);
     frame_read_ = frame;
     if (frame.get() && !frame->IsEndOfStream())
       num_decoded_frames_++;
     pending_read_ = false;
   }
 
   void OnReset() {
     DCHECK(!pending_read_);
     DCHECK(pending_reset_);
     pending_reset_ = false;
@@ skipping 373 matching lines @@
 }
 
 TEST_P(VideoFrameStreamTest, Stop_AfterRead_AfterReset) {
   Initialize();
   Read();
   Reset();
   Stop();
 }
 
 }  // namespace media