Return buffers from StreamParsers in a single unified map

media/formats/webm/webm_stream_parser.cc

Index: media/formats/webm/webm_stream_parser.cc
diff --git a/media/formats/webm/webm_stream_parser.cc b/media/formats/webm/webm_stream_parser.cc
index 88ccfb614af21a3010d7f4f56b927d859e1ee822..fc5b680555d26a81961097265822fe75376df3d3 100644
--- a/media/formats/webm/webm_stream_parser.cc
+++ b/media/formats/webm/webm_stream_parser.cc
@@ -264,15 +264,12 @@ int WebMStreamParser::ParseCluster(const uint8_t* data, int size) {
   if (bytes_parsed < 0)
     return bytes_parsed;
 
-  const BufferQueue& audio_buffers = cluster_parser_->GetAudioBuffers();
-  const BufferQueue& video_buffers = cluster_parser_->GetVideoBuffers();
-  const TextBufferQueueMap& text_map = cluster_parser_->GetTextBuffers();
+  BufferQueueMap buffer_queue_map;
+  cluster_parser_->GetBuffers(&buffer_queue_map);
 
   bool cluster_ended = cluster_parser_->cluster_ended();
 
-  if ((!audio_buffers.empty() || !video_buffers.empty() ||
-       !text_map.empty()) &&
-      !new_buffers_cb_.Run(audio_buffers, video_buffers, text_map)) {
+  if (!buffer_queue_map.empty() && !new_buffers_cb_.Run(buffer_queue_map)) {
     return -1;
   }