WIP fixing/extending acolwell's init-segment-received patch

media/filters/chunk_demuxer_unittest.cc

Index: media/filters/chunk_demuxer_unittest.cc
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc
index 2326de2de6600ef7c2c204cccb38b2f1a1d5aae7..f070f90ef4fe6b240c31b4cc26baa647507d3a57 100644
--- a/media/filters/chunk_demuxer_unittest.cc
+++ b/media/filters/chunk_demuxer_unittest.cc
@@ -139,6 +139,9 @@ static void OnSeekDone_OKExpected(bool* called, PipelineStatus status) {
 static void LogFunc(const std::string& str) { DVLOG(1) << str; }
 
 class ChunkDemuxerTest : public ::testing::Test {
+ public:
+  MOCK_METHOD1(OnNewInitSegment, void(const InitSegment&));
+
  protected:
   enum CodecsIndex {
     AUDIO,
@@ -347,7 +350,9 @@ class ChunkDemuxerTest : public ::testing::Test {
       return AddId(kSourceId, HAS_AUDIO | HAS_VIDEO);
     }
 
-    return demuxer_->AddId(source_id, type, codecs);
+    return demuxer_->AddId(source_id, type, codecs,
+                           base::Bind(&ChunkDemuxerTest::OnNewInitSegment,
+                                      base::Unretained(this)));
   }
 
   ChunkDemuxer::Status AddIdForMp2tSource(const std::string& source_id) {
@@ -355,7 +360,9 @@ class ChunkDemuxerTest : public ::testing::Test {
     std::string type = "video/mp2t";
     codecs.push_back("mp4a.40.2");
     codecs.push_back("avc1.640028");
-    return demuxer_->AddId(source_id, type, codecs);
+    return demuxer_->AddId(source_id, type, codecs,
+                           base::Bind(&ChunkDemuxerTest::OnNewInitSegment,
+                                      base::Unretained(this)));
   }
 
   void AppendData(const uint8* data, size_t length) {
@@ -1958,8 +1965,10 @@ TEST_F(ChunkDemuxerTest, AVHeadersWithAudioOnlyType) {
 
   std::vector<std::string> codecs(1);
   codecs[0] = "vorbis";
-  ASSERT_EQ(demuxer_->AddId(kSourceId, "audio/webm", codecs),
-            ChunkDemuxer::kOk);
+  ASSERT_EQ(ChunkDemuxer::kOk,
+            demuxer_->AddId(kSourceId, "audio/webm", codecs,
+                            base::Bind(&ChunkDemuxerTest::OnNewInitSegment,
+                                       base::Unretained(this))));
 
   AppendInitSegment(HAS_AUDIO | HAS_VIDEO);
 }
@@ -1972,8 +1981,10 @@ TEST_F(ChunkDemuxerTest, AVHeadersWithVideoOnlyType) {
 
   std::vector<std::string> codecs(1);
   codecs[0] = "vp8";
-  ASSERT_EQ(demuxer_->AddId(kSourceId, "video/webm", codecs),
-            ChunkDemuxer::kOk);
+  ASSERT_EQ(ChunkDemuxer::kOk,
+            demuxer_->AddId(kSourceId, "video/webm", codecs,
+                            base::Bind(&ChunkDemuxerTest::OnNewInitSegment,
+                                       base::Unretained(this))));
 
   AppendInitSegment(HAS_AUDIO | HAS_VIDEO);
 }
@@ -2528,7 +2539,10 @@ TEST_F(ChunkDemuxerTest, CodecPrefixMatching) {
   std::vector<std::string> codecs;
   codecs.push_back("avc1.4D4041");
 
-  EXPECT_EQ(demuxer_->AddId("source_id", "video/mp4", codecs), expected);
+  EXPECT_EQ(expected,
+            demuxer_->AddId("source_id", "video/mp4", codecs,
+                            base::Bind(&ChunkDemuxerTest::OnNewInitSegment,
+                                       base::Unretained(this))));
 }
 
 // Test codec ID's that are not compliant with RFC6381, but have been
@@ -2550,7 +2564,9 @@ TEST_F(ChunkDemuxerTest, CodecIDsThatAreNotRFC6381Compliant) {
     codecs.push_back(codec_ids[i]);
 
     ChunkDemuxer::Status result =
-        demuxer_->AddId("source_id", "audio/mp4", codecs);
+        demuxer_->AddId("source_id", "audio/mp4", codecs,
+                        base::Bind(&ChunkDemuxerTest::OnNewInitSegment,
+                                   base::Unretained(this)));
 
     EXPECT_EQ(result, expected)
         << "Fail to add codec_id '" << codec_ids[i] << "'";