Return buffers from StreamParsers in a single unified map

media/formats/webm/webm_stream_parser_unittest.cc

 // Copyright 2016 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 "media/formats/webm/webm_stream_parser.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "media/base/decoder_buffer.h"
@@ skipping 20 matching lines @@
                      const StreamParser::InitParameters& expected_params) {
     scoped_refptr<DecoderBuffer> buffer = ReadTestDataFile(filename);
     parser_.reset(new WebMStreamParser());
     Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb =
         base::Bind(&WebMStreamParserTest::OnEncryptedMediaInitData,
                    base::Unretained(this));
 
     EXPECT_CALL(*this, InitCB(_));
     EXPECT_CALL(*this, NewMediaSegmentCB()).Times(testing::AnyNumber());
     EXPECT_CALL(*this, EndMediaSegmentCB()).Times(testing::AnyNumber());
-    EXPECT_CALL(*this, NewBuffersCB(_, _, _))
+    EXPECT_CALL(*this, NewBuffersCB(_))
         .Times(testing::AnyNumber())
         .WillRepeatedly(testing::Return(true));
     parser_->Init(
         base::Bind(&WebMStreamParserTest::InitF, base::Unretained(this),
                    expected_params),
         base::Bind(&WebMStreamParserTest::NewConfigCB, base::Unretained(this)),
         base::Bind(&WebMStreamParserTest::NewBuffersCB, base::Unretained(this)),
         false,  // don't ignore_text_track
         encrypted_media_init_data_cb,
         base::Bind(&WebMStreamParserTest::NewMediaSegmentCB,
@@ skipping 20 matching lines @@
 
   MOCK_METHOD1(InitCB, void(const StreamParser::InitParameters& params));
 
   bool NewConfigCB(std::unique_ptr<MediaTracks> tracks,
                    const StreamParser::TextTrackConfigMap& text_track_map) {
     DCHECK(tracks.get());
     media_tracks_ = std::move(tracks);
     return true;
   }
 
-  MOCK_METHOD3(NewBuffersCB,
-               bool(const StreamParser::BufferQueue&,
-                    const StreamParser::BufferQueue&,
-                    const StreamParser::TextBufferQueueMap&));
+  MOCK_METHOD1(NewBuffersCB, bool(const StreamParser::BufferQueueMap&));
   MOCK_METHOD2(OnEncryptedMediaInitData,
                void(EmeInitDataType init_data_type,
                     const std::vector<uint8_t>& init_data));
   MOCK_METHOD0(NewMediaSegmentCB, void());
   MOCK_METHOD0(EndMediaSegmentCB, void());
 
   scoped_refptr<testing::StrictMock<MockMediaLog>> media_log_;
   std::unique_ptr<WebMStreamParser> parser_;
   std::unique_ptr<MediaTracks> media_tracks_;
 };
@@ skipping 54 matching lines @@
   params.detected_audio_track_count = 1;
   params.detected_video_track_count = 1;
   params.detected_text_track_count = 1;
   ParseWebMFile("bear-vp8-webvtt.webm", params);
   EXPECT_EQ(media_tracks_->tracks().size(), 2u);
   EXPECT_EQ(media_tracks_->tracks()[0]->type(), MediaTrack::Video);
   EXPECT_EQ(media_tracks_->tracks()[1]->type(), MediaTrack::Audio);
 }
 
 }  // namespace media