Remove MediaTracks::getFirstAudio/VideoConfig

media/formats/mp2t/mp2t_stream_parser_unittest.cc

Index: media/formats/mp2t/mp2t_stream_parser_unittest.cc
diff --git a/media/formats/mp2t/mp2t_stream_parser_unittest.cc b/media/formats/mp2t/mp2t_stream_parser_unittest.cc
index 9395a241d3c5fd14e7cc0c48cea27e9715141b4e..5134120fc277d3b1df50d7bf6510d8d8f3c57ea2 100644
--- a/media/formats/mp2t/mp2t_stream_parser_unittest.cc
+++ b/media/formats/mp2t/mp2t_stream_parser_unittest.cc
@@ -118,14 +118,25 @@ class Mp2tStreamParserTest : public testing::Test {
 
   bool OnNewConfig(std::unique_ptr<MediaTracks> tracks,
                    const StreamParser::TextTrackConfigMap& tc) {
-    const AudioDecoderConfig& ac = tracks->getFirstAudioConfig();
-    const VideoDecoderConfig& vc = tracks->getFirstVideoConfig();
-    DVLOG(1) << "OnNewConfig: media tracks count=" << tracks->tracks().size()
-             << ", audio=" << ac.IsValidConfig()
-             << ", video=" << vc.IsValidConfig();
+    DVLOG(1) << "OnNewConfig: got " << tracks->tracks().size() << " tracks";
+    bool found_audio_track = false;
+    bool found_video_track = false;
+    for (const auto& track : tracks->tracks()) {
+      const auto& track_id = track->bytestream_track_id();
+      if (track->type() == MediaTrack::Audio) {
+        found_audio_track = true;
+        EXPECT_TRUE(tracks->getAudioConfig(track_id).IsValidConfig());
+      } else if (track->type() == MediaTrack::Video) {
+        found_video_track = true;
+        EXPECT_TRUE(tracks->getVideoConfig(track_id).IsValidConfig());
+      } else {
+        // Unexpected track type.
+        NOTREACHED();

[wolenetz, 2016/06/16 21:25:00]

Sorry I missed this before: Don't use NOTREACHED() in tests per code style:
"Don't use these macros in tests, as they crash the test binary and leave bots
in a bad state. Use the ASSERT_xx() and EXPECT_xx() family of macros, which
report failures gracefully and can continue running other tests."

Unfortunately, it looks like we already violate that in a couple other places in
this file, too. At least don't introduce another instance here please.

[servolk, 2016/06/16 21:33:24]

Oh, good to know, thanks, I'll fix this.

+      }
+    }
+    EXPECT_TRUE(found_audio_track);
+    EXPECT_EQ(has_video_, found_video_track);
     config_count_++;
-    EXPECT_TRUE(ac.IsValidConfig());
-    EXPECT_EQ(vc.IsValidConfig(), has_video_);
     return true;
   }