Return buffers from StreamParsers in a single unified map

media/formats/common/stream_parser_test_base.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_FORMATS_COMMON_STREAM_PARSER_TEST_BASE_H_
 #define MEDIA_FORMATS_COMMON_STREAM_PARSER_TEST_BASE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 42 matching lines @@
     return last_audio_config_;
   }
 
  private:
   bool AppendDataInPieces(const uint8_t* data,
                           size_t length,
                           size_t piece_size);
   void OnInitDone(const StreamParser::InitParameters& params);
   bool OnNewConfig(std::unique_ptr<MediaTracks> tracks,
                    const StreamParser::TextTrackConfigMap& text_config);
-  bool OnNewBuffers(const StreamParser::BufferQueue& audio_buffers,
-                    const StreamParser::BufferQueue& video_buffers,
-                    const StreamParser::TextBufferQueueMap& text_map);
+  bool OnNewBuffers(const StreamParser::BufferQueueMap& buffer_queue_map);
   void OnKeyNeeded(EmeInitDataType type, const std::vector<uint8_t>& init_data);
   void OnNewSegment();
   void OnEndOfSegment();
 
   std::unique_ptr<StreamParser> parser_;
   std::stringstream results_stream_;
   AudioDecoderConfig last_audio_config_;
   StreamParser::TrackId audio_track_id_;
 
   DISALLOW_COPY_AND_ASSIGN(StreamParserTestBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_COMMON_STREAM_PARSER_TEST_BASE_H_