Remove MediaTracks::getFirstAudio/VideoConfig

media/formats/common/stream_parser_test_base.cc

 // 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.
 
 #include "media/formats/common/stream_parser_test_base.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 71 matching lines @@
 void StreamParserTestBase::OnInitDone(
     const StreamParser::InitParameters& params) {
   EXPECT_TRUE(params.auto_update_timestamp_offset);
   DVLOG(1) << __FUNCTION__ << "(" << params.duration.InMilliseconds() << ", "
            << params.auto_update_timestamp_offset << ")";
 }
 
 bool StreamParserTestBase::OnNewConfig(
     std::unique_ptr<MediaTracks> tracks,
     const StreamParser::TextTrackConfigMap& text_config) {
-  DVLOG(1) << __FUNCTION__ << " media tracks count=" << tracks->tracks().size();
+  DVLOG(1) << __FUNCTION__ << ": got " << tracks->tracks().size() << " tracks";
   EXPECT_EQ(tracks->tracks().size(), 1u);
-  EXPECT_TRUE(tracks->getFirstAudioConfig().IsValidConfig());
-  EXPECT_FALSE(tracks->getFirstVideoConfig().IsValidConfig());
-  last_audio_config_ = tracks->getFirstAudioConfig();
+  const auto& track = tracks->tracks()[0];
+  EXPECT_EQ(track->type(), MediaTrack::Audio);
+  last_audio_config_ = tracks->getAudioConfig(track->bytestream_track_id());
+  EXPECT_TRUE(last_audio_config_.IsValidConfig());
   return true;
 }
 
 bool StreamParserTestBase::OnNewBuffers(
     const StreamParser::BufferQueue& audio_buffers,
     const StreamParser::BufferQueue& video_buffers,
     const StreamParser::TextBufferQueueMap& text_map) {
   EXPECT_FALSE(audio_buffers.empty());
   EXPECT_TRUE(video_buffers.empty());
 
@@ skipping 17 matching lines @@
   DVLOG(1) << __FUNCTION__;
   results_stream_ << "NewSegment";
 }
 
 void StreamParserTestBase::OnEndOfSegment() {
   DVLOG(1) << __FUNCTION__;
   results_stream_ << "EndOfSegment";
 }
 
 }  // namespace media