Remove MediaTracks::getFirstAudio/VideoConfig

media/formats/mp2t/mp2t_stream_parser_unittest.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/mp2t/mp2t_stream_parser.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 100 matching lines @@
     return true;
   }
 
   void OnInit(const StreamParser::InitParameters& params) {
     DVLOG(1) << "OnInit: dur=" << params.duration.InMilliseconds()
              << ", autoTimestampOffset=" << params.auto_update_timestamp_offset;
   }
 
   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;
   }
 
 
   void DumpBuffers(const std::string& label,
                    const StreamParser::BufferQueue& buffers) {
     DVLOG(2) << "DumpBuffers: " << label << " size " << buffers.size();
     for (StreamParser::BufferQueue::const_iterator buf = buffers.begin();
          buf != buffers.end(); buf++) {
       DVLOG(3) << "  n=" << buf - buffers.begin()
@@ skipping 158 matching lines @@
   parser_->Flush();
   EXPECT_EQ(audio_frame_count_, 40);
   EXPECT_EQ(video_frame_count_, 0);
   // This stream has no mid-stream configuration change.
   EXPECT_EQ(config_count_, 1);
   EXPECT_EQ(segment_count_, 1);
 }
 
 }  // namespace mp2t
 }  // namespace media