Return buffers from StreamParsers in a single unified map

media/formats/common/stream_parser_test_base.cc

Index: media/formats/common/stream_parser_test_base.cc
diff --git a/media/formats/common/stream_parser_test_base.cc b/media/formats/common/stream_parser_test_base.cc
index 2af18a4c70fb1578ccaa322c8adede7944148ca2..04ab5211e183f95b66cce5e8f04afb33f7f777a2 100644
--- a/media/formats/common/stream_parser_test_base.cc
+++ b/media/formats/common/stream_parser_test_base.cc
@@ -100,21 +100,18 @@ bool StreamParserTestBase::OnNewConfig(
 }
 
 bool StreamParserTestBase::OnNewBuffers(
-    const StreamParser::BufferQueue& audio_buffers,
-    const StreamParser::BufferQueue& video_buffers,
-    const StreamParser::TextBufferQueueMap& text_map) {
+    const StreamParser::BufferQueueMap& buffer_queue_map) {
+  EXPECT_EQ(1u, buffer_queue_map.size());
+  const auto& itr_audio = buffer_queue_map.find(audio_track_id_);
+  EXPECT_NE(buffer_queue_map.end(), itr_audio);
+  const StreamParser::BufferQueue& audio_buffers = itr_audio->second;
   EXPECT_FALSE(audio_buffers.empty());
-  EXPECT_TRUE(video_buffers.empty());
 
   // Ensure that track ids are properly assigned on all emitted buffers.
   for (const auto& buf : audio_buffers) {
     EXPECT_EQ(audio_track_id_, buf->track_id());
   }
 
-  // TODO(wolenetz/acolwell): Add text track support to more MSE parsers. See
-  // http://crbug.com/336926.
-  EXPECT_TRUE(text_map.empty());
-
   const std::string buffers_str = BufferQueueToString(audio_buffers);
   DVLOG(1) << __FUNCTION__ << " : " << buffers_str;
   results_stream_ << buffers_str;