Add FakeVideoDecoder.

media/filters/fake_demuxer_stream_unittest.cc

Index: media/filters/fake_demuxer_stream_unittest.cc
diff --git a/media/filters/fake_demuxer_stream_unittest.cc b/media/filters/fake_demuxer_stream_unittest.cc
index 3a63e96fdb3a2d2e2ccc28e08bb2af9be3b99420..17a67ead051ba8d0c91a5b26a2d334f0665bdb38 100644
--- a/media/filters/fake_demuxer_stream_unittest.cc
+++ b/media/filters/fake_demuxer_stream_unittest.cc
@@ -13,10 +13,10 @@
 
 namespace media {
 
-static const int kNumFramesInOneConfig = 9;
-static const int kNumFramesToReadFirst = 5;
+static const int kNumBuffersInOneConfig = 9;
+static const int kNumBuffersToReadFirst = 5;
 static const int kNumConfigs = 3;
-COMPILE_ASSERT(kNumFramesToReadFirst < kNumFramesInOneConfig,
+COMPILE_ASSERT(kNumBuffersToReadFirst < kNumBuffersInOneConfig,
                do_not_read_too_many_buffers);
 COMPILE_ASSERT(kNumConfigs > 0, need_multiple_configs_to_trigger_config_change);
 
@@ -45,21 +45,21 @@ class FakeDemuxerStreamTest : public testing::Test {
 
   void EnterNormalReadState() {
     stream_.reset(
-        new FakeDemuxerStream(kNumConfigs, kNumFramesInOneConfig, false));
-    for (int i = 0; i < kNumFramesToReadFirst; ++i)
+        new FakeDemuxerStream(kNumConfigs, kNumBuffersInOneConfig, false));
+    for (int i = 0; i < kNumBuffersToReadFirst; ++i)
       ReadAndExpect(OK);
   }
 
   void EnterBeforeConfigChangedState() {
     stream_.reset(
-        new FakeDemuxerStream(kNumConfigs, kNumFramesInOneConfig, false));
-    for (int i = 0; i < kNumFramesInOneConfig; ++i)
+        new FakeDemuxerStream(kNumConfigs, kNumBuffersInOneConfig, false));
+    for (int i = 0; i < kNumBuffersInOneConfig; ++i)
       ReadAndExpect(OK);
   }
 
   void EnterBeforeEOSState() {
-    stream_.reset(new FakeDemuxerStream(1, kNumFramesInOneConfig, false));
-    for (int i = 0; i < kNumFramesInOneConfig; ++i)
+    stream_.reset(new FakeDemuxerStream(1, kNumBuffersInOneConfig, false));
+    for (int i = 0; i < kNumBuffersInOneConfig; ++i)
       ReadAndExpect(OK);
   }
 
@@ -124,18 +124,23 @@ class FakeDemuxerStreamTest : public testing::Test {
   }
 
   void TestRead(int num_configs,
-                int num_frames_in_one_config,
+                int num_buffers_in_one_config,
                 bool is_encrypted) {
     stream_.reset(new FakeDemuxerStream(
-        num_configs, num_frames_in_one_config, is_encrypted));
+        num_configs, num_buffers_in_one_config, is_encrypted));
+
+    int num_buffers_received = 0;
 
     const VideoDecoderConfig& config = stream_->video_decoder_config();
     EXPECT_TRUE(config.IsValidConfig());
     EXPECT_EQ(is_encrypted, config.is_encrypted());
 
     for (int i = 0; i < num_configs; ++i) {
-      for (int j = 0; j < num_frames_in_one_config; ++j)
+      for (int j = 0; j < num_buffers_in_one_config; ++j) {
         ReadAndExpect(OK);
+        num_buffers_received++;
+        EXPECT_EQ(num_buffers_received, stream_->num_buffers_returned());
+      }
 
       if (i == num_configs - 1)
         ReadAndExpect(EOS);
@@ -145,6 +150,8 @@ class FakeDemuxerStreamTest : public testing::Test {
 
     // Will always get EOS after we hit EOS.
     ReadAndExpect(EOS);
+
+    EXPECT_EQ(num_configs * num_buffers_in_one_config, num_buffers_received);
   }
 
   base::MessageLoop message_loop_;
@@ -153,6 +160,7 @@ class FakeDemuxerStreamTest : public testing::Test {
   DemuxerStream::Status status_;
   scoped_refptr<DecoderBuffer> buffer_;
   bool read_pending_;
+  int num_buffers_received_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeDemuxerStreamTest);
@@ -166,7 +174,7 @@ TEST_F(FakeDemuxerStreamTest, Read_MultipleConfigs) {
   TestRead(3, 5, false);
 }
 
-TEST_F(FakeDemuxerStreamTest, Read_OneFramePerConfig) {
+TEST_F(FakeDemuxerStreamTest, Read_OneBufferPerConfig) {
   TestRead(3, 1, false);
 }