Return buffers from StreamParsers in a single unified map

media/formats/webm/webm_stream_parser_unittest.cc

Index: media/formats/webm/webm_stream_parser_unittest.cc
diff --git a/media/formats/webm/webm_stream_parser_unittest.cc b/media/formats/webm/webm_stream_parser_unittest.cc
index 6a413951d907c3d51b4e68603077c312735a7758..03cf928f050b8aab2460fba3d18bedad198e7d39 100644
--- a/media/formats/webm/webm_stream_parser_unittest.cc
+++ b/media/formats/webm/webm_stream_parser_unittest.cc
@@ -38,7 +38,7 @@ class WebMStreamParserTest : public testing::Test {
     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(
@@ -79,10 +79,7 @@ class WebMStreamParserTest : public testing::Test {
     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));