Fix ChunkDemuxer seek and init callback dispatch.

media/filters/chunk_demuxer_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 <algorithm>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/decoder_buffer.h"
@@ skipping 442 matching lines @@
     // segment.
     AppendData(bear1->GetData(), 4370);
     AppendData(bear1->GetData() + 72737, 28183);
     CheckExpectedRanges(kSourceId, "{ [0,2737) }");
 
     demuxer_->EndOfStream(PIPELINE_OK);
     return true;
   }
 
   void ShutdownDemuxer() {
-    if (demuxer_)
+    if (demuxer_) {
       demuxer_->Shutdown();
+      message_loop_.RunUntilIdle();
+    }
   }
 
   void AddSimpleBlock(ClusterBuilder* cb, int track_num, int64 timecode) {
     uint8 data[] = { 0x00 };
     cb->AddSimpleBlock(track_num, timecode, 0, data, sizeof(data));
   }
 
   scoped_ptr<Cluster> GenerateCluster(int timecode, int block_count) {
     return GenerateCluster(timecode, timecode, block_count);
   }
@@ skipping 411 matching lines @@
                  NewExpectedStatusCB(PIPELINE_OK));
 
   EXPECT_CALL(*this, Checkpoint(2));
 
   scoped_ptr<Cluster> cluster(kDefaultSecondCluster());
 
   Checkpoint(1);
 
   AppendData(cluster->data(), cluster->size());
 
+  message_loop_.RunUntilIdle();
+
   Checkpoint(2);
 }
 
 // Test that parsing errors are handled for clusters appended after init.
 TEST_F(ChunkDemuxerTest, TestErrorWhileParsingClusterAfterInit) {
   ASSERT_TRUE(InitDemuxer(true, true));
   scoped_ptr<Cluster> first_cluster(kDefaultFirstCluster());
   AppendData(first_cluster->data(), first_cluster->size());
 
   EXPECT_CALL(host_, OnDemuxerError(PIPELINE_ERROR_DECODE));
@@ skipping 820 matching lines @@
 
   AppendData(cluster_a1->data(), cluster_a1->size());
   AppendData(cluster_v1->data(), cluster_v1->size());
 
   // Seeking past the end of video.
   // Note: audio data is available for that seek point.
   bool seek_cb_was_called = false;
   demuxer_->StartWaitingForSeek();
   demuxer_->Seek(base::TimeDelta::FromMilliseconds(110),
                  base::Bind(OnSeekDone_OKExpected, &seek_cb_was_called));
+  message_loop_.RunUntilIdle();
+
   EXPECT_FALSE(seek_cb_was_called);
 
   EXPECT_CALL(host_, SetDuration(
       base::TimeDelta::FromMilliseconds(120)));
   demuxer_->EndOfStream(PIPELINE_OK);
+  message_loop_.RunUntilIdle();
+
   EXPECT_TRUE(seek_cb_was_called);
 
   ShutdownDemuxer();
 }
 
 // Test that EndOfStream is ignored if coming during a pending seek
 // whose seek time is before some existing ranges.
 TEST_F(ChunkDemuxerTest, TestEndOfStreamDuringPendingSeek) {
   ASSERT_TRUE(InitDemuxer(true, true));
 
   scoped_ptr<Cluster> cluster_a1(
       GenerateSingleStreamCluster(0, 120, kAudioTrackNum, 10));
   scoped_ptr<Cluster> cluster_v1(
       GenerateSingleStreamCluster(0, 100, kVideoTrackNum, 5));
 
   scoped_ptr<Cluster> cluster_a2(
       GenerateSingleStreamCluster(200, 300, kAudioTrackNum, 10));
   scoped_ptr<Cluster> cluster_v2(
       GenerateSingleStreamCluster(200, 300, kVideoTrackNum, 5));
 
   AppendData(cluster_a1->data(), cluster_a1->size());
   AppendData(cluster_v1->data(), cluster_v1->size());
   AppendData(cluster_a2->data(), cluster_a2->size());
   AppendData(cluster_v2->data(), cluster_v2->size());
 
   bool seek_cb_was_called = false;
   demuxer_->StartWaitingForSeek();
   demuxer_->Seek(base::TimeDelta::FromMilliseconds(160),
                  base::Bind(OnSeekDone_OKExpected, &seek_cb_was_called));
+  message_loop_.RunUntilIdle();
+
   EXPECT_FALSE(seek_cb_was_called);
 
   EXPECT_CALL(host_, SetDuration(
       base::TimeDelta::FromMilliseconds(300)));
   demuxer_->EndOfStream(PIPELINE_OK);
+  message_loop_.RunUntilIdle();
+
   EXPECT_FALSE(seek_cb_was_called);
 
   scoped_ptr<Cluster> cluster_a3(
       GenerateSingleStreamCluster(140, 180, kAudioTrackNum, 10));
   scoped_ptr<Cluster> cluster_v3(
       GenerateSingleStreamCluster(140, 180, kVideoTrackNum, 5));
   AppendData(cluster_a3->data(), cluster_a3->size());
   AppendData(cluster_v3->data(), cluster_v3->size());
+
+  message_loop_.RunUntilIdle();
+
   EXPECT_TRUE(seek_cb_was_called);
 
   ShutdownDemuxer();
 }
 
 // Test ranges in an audio-only stream.
 TEST_F(ChunkDemuxerTest, GetBufferedRanges_AudioIdOnly) {
   EXPECT_CALL(*this, DemuxerOpened());
   demuxer_->Initialize(
       &host_, CreateInitDoneCB(kDefaultDuration(), PIPELINE_OK));
@@ skipping 759 matching lines @@
   EXPECT_FALSE(audio_read_done);
   EXPECT_FALSE(video_read_done);
 
   demuxer_->EndOfStream(PIPELINE_OK);
 
   EXPECT_TRUE(audio_read_done);
   EXPECT_TRUE(video_read_done);
 }
 
 }  // namespace media